update 30 to fix issue #423

brunobuzzi · Jul 30, 2021 · c77a09c · c77a09c
1 parent 18af96a
commit c77a09c
Show file tree

Hide file tree

Showing 36 changed files with 76 additions and 43 deletions.
diff --git a/...beonPersistenceApi.package/OrbeonAllFormDefinitionVersionsApi.class/methodProperties.json b/...beonPersistenceApi.package/OrbeonAllFormDefinitionVersionsApi.class/methodProperties.json
@@ -7,4 +7,4 @@
 		"doIt" : "brunobb 07/22/2021 13:20",
 		"generateXmlNodeForFormBuilderVersionList:with:" : "brunobb 04/22/2021 10:17",
 		"generateXmlWithAllFormDefinitionsIn:" : "brunobb 04/22/2021 09:52",
-		"generateXmlWithLatestFormDefinitionVersionIn:" : "brunobb 04/22/2021 09:50" } }
+		"generateXmlWithLatestFormDefinitionVersionIn:" : "brunobb 07/29/2021 14:29" } }
diff --git a/repository/OrbeonPersistenceApi.package/OrbeonDefinitionSearchApi.class/instance/doIt.st b/repository/OrbeonPersistenceApi.package/OrbeonDefinitionSearchApi.class/instance/doIt.st
@@ -1,8 +1,8 @@
 other
 doIt
 
-	summary := OrbeonFormDefinitionsSummary 
-								newFor: user 
+	summary := OrbeonFormDefinitionsSummary newOn: systemRoot
+								for: user 
 								group: group 
 								credentials: userCredentials
 								pageSize: pageSize 

diff --git a/...sitory/OrbeonPersistenceApi.package/OrbeonDefinitionSearchApi.class/methodProperties.json b/...sitory/OrbeonPersistenceApi.package/OrbeonDefinitionSearchApi.class/methodProperties.json
@@ -2,7 +2,7 @@
 	"class" : {
 		"newOn:withXml:" : "brunobb 06/04/2021 14:08" },
 	"instance" : {
-		"doIt" : "brunobb 06/05/2020 19:54",
+		"doIt" : "brunobb 07/27/2021 12:27",
 		"generateXmlAnswerForBuilderSummary" : "BrunoBB 12/30/2016 03:27",
 		"generateXmlNodeForAllDefinitionWith:" : "brunobb 02/19/2021 13:39",
 		"generateXmlNodeForDefinition:with:" : "BrunoBB 12/30/2016 04:13",

diff --git a/...PersistenceApi.package/OrbeonFormBuilderApi.class/instance/createOrbeonSavedDefinition.st b/...PersistenceApi.package/OrbeonFormBuilderApi.class/instance/createOrbeonSavedDefinition.st
@@ -1,4 +1,4 @@
 other
 createOrbeonSavedDefinition
 
-	^self defaultSavedFormDefinitionClass newNamed: self getFormName inAppNamed: self getApplicationName
+	^self defaultSavedFormDefinitionClass newNamed: self getFormName in: (systemRoot getExistingApplicationOrCreateNewNamed: self getApplicationName)
diff --git a/repository/OrbeonPersistenceApi.package/OrbeonFormBuilderApi.class/methodProperties.json b/repository/OrbeonPersistenceApi.package/OrbeonFormBuilderApi.class/methodProperties.json
@@ -3,7 +3,7 @@
 		 },
 	"instance" : {
 		"createAndStoreSavedDefinitionOnApplication" : "brunobb 03/25/2021 14:35",
-		"createOrbeonSavedDefinition" : "brunobb 04/27/2021 13:10",
+		"createOrbeonSavedDefinition" : "brunobb 07/27/2021 11:57",
 		"ifRequiredUpdateForm" : "brunobb 07/22/2021 13:12",
 		"initialize" : "brunobb 02/15/2018 13:03",
 		"isCreationRejectedFor:" : "brunobb 06/26/2020 13:55",

diff --git a/...stenceApi.package/OrbeonFormBuilderPublishApi.class/instance/createPublishedDefinition.st b/...stenceApi.package/OrbeonFormBuilderPublishApi.class/instance/createPublishedDefinition.st
@@ -3,7 +3,7 @@ createPublishedDefinition
 	"The receiver create a new definition <anOrbeonFormDefinition> named <formName> in application <anOrbeonApplication> with id <id>"
 	| anOrbeonPublishedDefinition |
 
-	anOrbeonPublishedDefinition := self defaultPublishedFormDefinitionClass newNamed: self getFormName inAppNamed: self getApplicationName.
+	anOrbeonPublishedDefinition := self defaultPublishedFormDefinitionClass newNamed: self getFormName in: (systemRoot getExistingApplicationOrCreateNewNamed: self getApplicationName).
 	anOrbeonPublishedDefinition associateSavedAndPublishedForms.
 
 	^anOrbeonPublishedDefinition "new definition to be published"

diff --git a/...tory/OrbeonPersistenceApi.package/OrbeonFormBuilderPublishApi.class/methodProperties.json b/...tory/OrbeonPersistenceApi.package/OrbeonFormBuilderPublishApi.class/methodProperties.json
@@ -2,7 +2,7 @@
 	"class" : {
 		 },
 	"instance" : {
-		"createPublishedDefinition" : "brunobb 04/27/2021 14:48",
+		"createPublishedDefinition" : "brunobb 07/27/2021 11:58",
 		"doItIfNotFound:" : "brunobb 07/22/2021 13:29",
 		"headerVersion" : "brunobb 02/15/2018 13:07",
 		"headerVersion:" : "brunobb 02/15/2018 13:07",

diff --git a/...tory/OrbeonPersistenceApi.package/OrbeonFormDefinitionDuplicateApi.class/instance/doIt.st b/...tory/OrbeonPersistenceApi.package/OrbeonFormDefinitionDuplicateApi.class/instance/doIt.st
@@ -1,12 +1,16 @@
 other
 doIt
-	| savedDefinition |
+	| savedDefinition builder |
 
-	savedDefinition := self defaultSavedFormDefinitionClass new.
+	builder := systemRoot newFormBuilderFor: xmlString.
+	appName := builder getApplicationName.
+	formName := builder getFormName.
+
+	savedDefinition := self defaultSavedFormDefinitionClass newNamed: formName in: (systemRoot getExistingApplicationOrCreateNewNamed: appName).
 
 	savedDefinition xmlString: xmlString;
 		id: id;
-		setMetadata; "set: application, formName, title, description"
+		setTitleAndDescriptionWith: builder;
 		version: 1; "when a form is duplicate it always start at version 1"
 		updateLastModifiedTime.
 

diff --git a/...OrbeonPersistenceApi.package/OrbeonFormDefinitionDuplicateApi.class/methodProperties.json b/...OrbeonPersistenceApi.package/OrbeonFormDefinitionDuplicateApi.class/methodProperties.json
@@ -2,4 +2,4 @@
 	"class" : {
 		 },
 	"instance" : {
-		"doIt" : "brunobb 04/27/2021 13:08" } }
+		"doIt" : "brunobb 07/28/2021 14:16" } }
diff --git a/...finitionsSummary.class/class/newOn.for.group.credentials.pageSize.pageNumber.xmlQuery..st b/...finitionsSummary.class/class/newOn.for.group.credentials.pageSize.pageNumber.xmlQuery..st
@@ -0,0 +1,4 @@
+other
+newOn: anOrbeonSystemRoot for: user group: group credentials: credentials pageSize: pageSize pageNumber: pageNumber xmlQuery: xmlDocument
+
+	^self new setRoot: anOrbeonSystemRoot user: user group: group credentials: credentials pageSize: pageSize pageNumber: pageNumber xmlQuery: xmlDocument
diff --git a/...enceApi.package/OrbeonFormDefinitionsSummary.class/instance/buildStreamFormDefinitions.st b/...enceApi.package/OrbeonFormDefinitionsSummary.class/instance/buildStreamFormDefinitions.st
@@ -2,6 +2,6 @@ streams building
 buildStreamFormDefinitions
 	| allSavedDefinitions | 
 
-	allSavedDefinitions := self systemRoot getAllSavedDefinitions.
+	allSavedDefinitions := systemRoot getAllSavedDefinitions.
 
 	summaryStream fetchFormDefinitionsOn: allSavedDefinitions from: self pageFrom to: self pageTo
diff --git a/...onsSummary.class/instance/setRoot.user.group.credentials.pageSize.pageNumber.xmlQuery..st b/...onsSummary.class/instance/setRoot.user.group.credentials.pageSize.pageNumber.xmlQuery..st
@@ -0,0 +1,14 @@
+private
+setRoot: anOrbeonSystemRoot user: username group: groupname credentials: credentials pageSize: pSize pageNumber: pNumber xmlQuery: xmlDocument
+
+	returnedFormsSize := 0.
+	totalFormsSize := 0.
+	summaryStream := OrbeonSummaryStream newOn: self.
+
+	systemRoot := anOrbeonSystemRoot.
+	user := username.
+	group := groupname.
+	userCredentials := credentials.
+	pageSize := pSize.
+	pageNumber := pNumber.
+	xmlQuery := xmlDocument
diff --git a/...ory/OrbeonPersistenceApi.package/OrbeonFormDefinitionsSummary.class/methodProperties.json b/...ory/OrbeonPersistenceApi.package/OrbeonFormDefinitionsSummary.class/methodProperties.json
@@ -1,7 +1,8 @@
 {
 	"class" : {
-		 },
+		"newOn:for:group:credentials:pageSize:pageNumber:xmlQuery:" : "brunobb 07/27/2021 12:25" },
 	"instance" : {
-		"buildStreamFormDefinitions" : "brunobb 07/22/2021 13:18",
+		"buildStreamFormDefinitions" : "brunobb 07/27/2021 12:28",
 		"buildStreams" : "brunobb 06/05/2020 19:58",
-		"selectFormsDefinitionsFrom:" : "brunobb 11/24/2020 12:38" } }
+		"selectFormsDefinitionsFrom:" : "brunobb 11/24/2020 12:38",
+		"setRoot:user:group:credentials:pageSize:pageNumber:xmlQuery:" : "brunobb 07/27/2021 12:26" } }
diff --git a/repository/OrbeonPersistenceApi.package/OrbeonFormDefinitionsSummary.class/properties.json b/repository/OrbeonPersistenceApi.package/OrbeonFormDefinitionsSummary.class/properties.json
@@ -6,7 +6,8 @@
 		 ],
 	"commentStamp" : "",
 	"instvars" : [
-		"definitionsReadStream" ],
+		"definitionsReadStream",
+		"systemRoot" ],
 	"name" : "OrbeonFormDefinitionsSummary",
 	"pools" : [
 		 ],

diff --git a/repository/OrbeonPersistenceApi.package/OrbeonMaintenanceScript.class/class/newOn..st b/repository/OrbeonPersistenceApi.package/OrbeonMaintenanceScript.class/class/newOn..st
@@ -0,0 +1,4 @@
+instance creation
+newOn: anOrbeonSystemRoot
+
+	^self new setRoot: anOrbeonSystemRoot
diff --git a/...lass/class/attachmentStructureExistAt..st → ...s/instance/attachmentStructureExistAt..st b/...lass/class/attachmentStructureExistAt..st → ...s/instance/attachmentStructureExistAt..st
diff --git a/...s/class/createEmptyAttachmentStructure.st → ...nstance/createEmptyAttachmentStructure.st b/...s/class/createEmptyAttachmentStructure.st → ...nstance/createEmptyAttachmentStructure.st
diff --git a/...lass/createEmptyAttachmentStructureAt..st → ...ance/createEmptyAttachmentStructureAt..st b/...lass/createEmptyAttachmentStructureAt..st → ...ance/createEmptyAttachmentStructureAt..st
diff --git a/...nceScript.class/class/deleteAllOSFiles.st → ...Script.class/instance/deleteAllOSFiles.st b/...nceScript.class/class/deleteAllOSFiles.st → ...Script.class/instance/deleteAllOSFiles.st
diff --git a/...Script.class/class/deleteAllOSFilesAt..st → ...ipt.class/instance/deleteAllOSFilesAt..st b/...Script.class/class/deleteAllOSFilesAt..st → ...ipt.class/instance/deleteAllOSFilesAt..st
diff --git a/.../class/deleteUnusedFormInstanceOSFiles.st → ...stance/deleteUnusedFormInstanceOSFiles.st b/.../class/deleteUnusedFormInstanceOSFiles.st → ...stance/deleteUnusedFormInstanceOSFiles.st
diff --git a/...lass/deleteUnusedOSFiles.pathSelector..st → ...ance/deleteUnusedOSFiles.pathSelector..st b/...lass/deleteUnusedOSFiles.pathSelector..st → ...ance/deleteUnusedOSFiles.pathSelector..st
diff --git a/...lass/deleteUnusedPublishedFormsOSFiles.st → ...ance/deleteUnusedPublishedFormsOSFiles.st b/...lass/deleteUnusedPublishedFormsOSFiles.st → ...ance/deleteUnusedPublishedFormsOSFiles.st
diff --git a/...ss/class/deleteUnusedSavedFormsOSFiles.st → ...instance/deleteUnusedSavedFormsOSFiles.st b/...ss/class/deleteUnusedSavedFormsOSFiles.st → ...instance/deleteUnusedSavedFormsOSFiles.st
diff --git a/...s/class/getDefinitionUsedAttachmentIDs.st → ...nstance/getDefinitionUsedAttachmentIDs.st b/...s/class/getDefinitionUsedAttachmentIDs.st → ...nstance/getDefinitionUsedAttachmentIDs.st
@@ -5,7 +5,7 @@ getDefinitionUsedAttachmentIDs
 
 	allAttachmentIds := Dictionary new.
 
-	self getOrbeonApplicationClass doInCache: [:eachApp | 
+	root doInCache: [:eachApp | 
 		eachApp definitionsRegistryKeysAndValuesDo: [:formName :registry |
 
 			registry currentVersionsDo: [:eachDef | 

diff --git a/...getInstanceDefinitionUsedAttachmentIDs.st → ...getInstanceDefinitionUsedAttachmentIDs.st b/...getInstanceDefinitionUsedAttachmentIDs.st → ...getInstanceDefinitionUsedAttachmentIDs.st
@@ -5,7 +5,7 @@ getInstanceDefinitionUsedAttachmentIDs
 
 	allAttachmentIds := Dictionary new.
 
-	self getOrbeonApplicationClass doInCache: [:eachApp | 
+	root doInCache: [:eachApp | 
 		eachApp definitionsRegistryKeysAndValuesDo: [:formName :registry |
 
 			registry savedDefinitionsDo: [:eachInstDef | 

diff --git a/...ss/class/getInstancesUsedAttachmentIDs.st → ...instance/getInstancesUsedAttachmentIDs.st b/...ss/class/getInstancesUsedAttachmentIDs.st → ...instance/getInstancesUsedAttachmentIDs.st
@@ -5,7 +5,7 @@ getInstancesUsedAttachmentIDs
 
 	allAttachmentIds := Dictionary new.
 
-	self getOrbeonApplicationClass doInCache: [:eachApp | 
+	root doInCache: [:eachApp | 
 		eachApp definitionsRegistryKeysAndValuesDo: [:formName :registry |
 
 			registry currentVersionsDo: [:eachDef | 

diff --git a/...ss/class/physicallyRemoveFormInstances.st → ...instance/physicallyRemoveFormInstances.st b/...ss/class/physicallyRemoveFormInstances.st → ...instance/physicallyRemoveFormInstances.st
@@ -4,5 +4,5 @@ physicallyRemoveFormInstances
 	"This is a Time and Resource consuming Operation"
 	"Remove all FormInstances where <deleted> is 'Y' "
 
-	(self getOrbeonApplicationClass getAllInstances select: [:each | each deleted = 'Y']) do: [:each | 
+	(root getAllInstances select: [:each | each deleted = 'Y']) do: [:each | 
 		each definition removeInstance: each]
diff --git a/...s/class/physicallyRemovePublishedForms.st → ...nstance/physicallyRemovePublishedForms.st b/...s/class/physicallyRemovePublishedForms.st → ...nstance/physicallyRemovePublishedForms.st
@@ -4,5 +4,5 @@ physicallyRemovePublishedForms
 	"This is a Time and Resource consuming Operation"
 	"Remove all FormDefinitions where <deleted> is 'Y' "
 
-	(self getOrbeonApplicationClass getAllFormDefinitions select: [:each | each deleted = 'Y']) do: [:each | 
+	(root getAllFormDefinitions select: [:each | each deleted = 'Y']) do: [:each | 
 		each getApplication removeDefinition: each]
diff --git a/...class/class/physicallyRemoveSavedForms.st → ...ss/instance/physicallyRemoveSavedForms.st b/...class/class/physicallyRemoveSavedForms.st → ...ss/instance/physicallyRemoveSavedForms.st
@@ -4,5 +4,5 @@ physicallyRemoveSavedForms
 	"This is a Time and Resource consuming Operation"
 	"Remove all FormInstanceDefinitions where <deleted> is 'Y' "
 
-	(self getOrbeonApplicationClass getAllSavedDefinitions select: [:each | each deleted = 'Y']) do: [:each | 
+	(root getAllSavedDefinitions select: [:each | each deleted = 'Y']) do: [:each | 
 		each getApplication removeSavedDefinition: each]
diff --git a/repository/OrbeonPersistenceApi.package/OrbeonMaintenanceScript.class/instance/setRoot..st b/repository/OrbeonPersistenceApi.package/OrbeonMaintenanceScript.class/instance/setRoot..st
@@ -0,0 +1,4 @@
+private
+setRoot: anOrbeonSystemRoot
+
+	root := anOrbeonSystemRoot
diff --git a/repository/OrbeonPersistenceApi.package/OrbeonMaintenanceScript.class/methodProperties.json b/repository/OrbeonPersistenceApi.package/OrbeonMaintenanceScript.class/methodProperties.json
@@ -1,19 +1,20 @@
 {
 	"class" : {
-		"attachmentStructureExistAt:" : "brunobb 09/10/2020 12:44",
-		"createEmptyAttachmentStructure" : "brunobb 06/13/2020 17:23",
-		"createEmptyAttachmentStructureAt:" : "brunobb 09/10/2020 12:51",
-		"deleteAllOSFiles" : "brunobb 06/13/2020 17:23",
-		"deleteAllOSFilesAt:" : "brunobb 05/29/2020 11:43",
-		"deleteUnusedFormInstanceOSFiles" : "BrunoBB 05/04/2016 14:52",
-		"deleteUnusedOSFiles:pathSelector:" : "brunobb 03/12/2020 15:05",
-		"deleteUnusedPublishedFormsOSFiles" : "BrunoBB 05/04/2016 14:53",
-		"deleteUnusedSavedFormsOSFiles" : "BrunoBB 05/04/2016 14:52",
-		"getDefinitionUsedAttachmentIDs" : "brunobb 08/14/2020 10:39",
-		"getInstanceDefinitionUsedAttachmentIDs" : "brunobb 08/14/2020 10:39",
-		"getInstancesUsedAttachmentIDs" : "bruno 07/17/2020 11:05",
-		"physicallyRemoveFormInstances" : "BrunoBB 02/08/2016 11:29",
-		"physicallyRemovePublishedForms" : "BrunoBB 05/04/2016 14:54",
-		"physicallyRemoveSavedForms" : "brunobb 07/03/2020 13:45" },
+		"newOn:" : "brunobb 07/22/2021 14:59" },
 	"instance" : {
-		 } }
+		"attachmentStructureExistAt:" : "brunobb 07/22/2021 14:49",
+		"createEmptyAttachmentStructure" : "brunobb 07/22/2021 14:47",
+		"createEmptyAttachmentStructureAt:" : "brunobb 07/22/2021 14:47",
+		"deleteAllOSFiles" : "brunobb 07/22/2021 14:47",
+		"deleteAllOSFilesAt:" : "brunobb 07/22/2021 14:47",
+		"deleteUnusedFormInstanceOSFiles" : "brunobb 07/22/2021 14:47",
+		"deleteUnusedOSFiles:pathSelector:" : "brunobb 07/22/2021 14:48",
+		"deleteUnusedPublishedFormsOSFiles" : "brunobb 07/22/2021 14:48",
+		"deleteUnusedSavedFormsOSFiles" : "brunobb 07/22/2021 14:48",
+		"getDefinitionUsedAttachmentIDs" : "brunobb 07/22/2021 14:51",
+		"getInstanceDefinitionUsedAttachmentIDs" : "brunobb 07/22/2021 14:51",
+		"getInstancesUsedAttachmentIDs" : "brunobb 07/22/2021 14:51",
+		"physicallyRemoveFormInstances" : "brunobb 07/22/2021 14:54",
+		"physicallyRemovePublishedForms" : "brunobb 07/22/2021 14:54",
+		"physicallyRemoveSavedForms" : "brunobb 07/22/2021 14:54",
+		"setRoot:" : "brunobb 07/22/2021 14:50" } }
diff --git a/repository/OrbeonPersistenceApi.package/OrbeonMaintenanceScript.class/properties.json b/repository/OrbeonPersistenceApi.package/OrbeonMaintenanceScript.class/properties.json
@@ -6,7 +6,7 @@
 		 ],
 	"commentStamp" : "",
 	"instvars" : [
-		 ],
+		"root" ],
 	"name" : "OrbeonMaintenanceScript",
 	"pools" : [
 		 ],

diff --git a/...ackage/OrbeonServiceOperationApi.class/instance/setApplicationAndFormNameFromXmlString.st b/...ackage/OrbeonServiceOperationApi.class/instance/setApplicationAndFormNameFromXmlString.st
@@ -2,6 +2,6 @@ other
 setApplicationAndFormNameFromXmlString
 	| reader |
 
-	reader := self defaultOrbeonFormBuilderClass for: xmlString.
+	reader := systemRoot newFormBuilderFor: xmlString.
 	appName := reader getApplicationName.
 	formName := reader getFormName.
diff --git a/...sitory/OrbeonPersistenceApi.package/OrbeonServiceOperationApi.class/methodProperties.json b/...sitory/OrbeonPersistenceApi.package/OrbeonServiceOperationApi.class/methodProperties.json
@@ -25,7 +25,7 @@
 		"id:" : "brunobb 02/15/2018 12:44",
 		"parseXmlString" : "brunobb 02/15/2018 13:05",
 		"seasideMimeDocument" : "brunobb 02/17/2018 09:10",
-		"setApplicationAndFormNameFromXmlString" : "brunobb 04/16/2021 08:01",
+		"setApplicationAndFormNameFromXmlString" : "brunobb 07/24/2021 13:00",
 		"setId:" : "brunobb 06/26/2020 15:14",
 		"setUserCredentialsFrom:" : "brunobb 08/27/2020 12:07",
 		"setWorldManager:" : "brunobb 06/15/2021 10:46",

diff --git a/repository/OrbeonPersistenceApi.package/monticello.meta/version b/repository/OrbeonPersistenceApi.package/monticello.meta/version