Skip to content

Commit

Permalink
refactoring related to #423
Browse files Browse the repository at this point in the history
  • Loading branch information
@brunobuzzi
brunobuzzi committed Aug 22, 2021
1 parent c56c14e commit 375237a
Show file tree
Hide file tree
Showing 33 changed files with 47 additions and 57 deletions.
0 ...n.extension/instance/setLocalForOrbeon.st → ...n.extension/instance/setLocalForOrbeon.st
View file
File renamed without changes.
5 changes: 5 additions & 0 deletions repository/OrbeonWeb.package/ApplicationServerConfiguration.extension/methodProperties.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"class" : {
},
"instance" : {
"setLocalForOrbeon" : "brunobb 08/19/2021 11:57" } }
2 changes: 2 additions & 0 deletions repository/OrbeonWeb.package/ApplicationServerConfiguration.extension/properties.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
{
"name" : "ApplicationServerConfiguration" }
5 changes: 0 additions & 5 deletions repository/OrbeonWeb.package/GemStoneServerConfiguration.extension/methodProperties.json
View file

This file was deleted.

2 changes: 0 additions & 2 deletions repository/OrbeonWeb.package/GemStoneServerConfiguration.extension/properties.json
View file

This file was deleted.

2 changes: 1 addition & 1 deletion repository/OrbeonWeb.package/WAOrbeonAdministrationPortal.class/instance/logout.st
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ logout

self session logout.
self session unregister.
self requestContext redirectTo: (self getGemStoneServerConfiguration gemstoneIP, '/orbeon')
self requestContext redirectTo: (self session systemRoot gemstoneIP, '/orbeon')
2 changes: 1 addition & 1 deletion repository/OrbeonWeb.package/WAOrbeonAdministrationPortal.class/methodProperties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"importFormsFromDatabase" : "brunobb 05/08/2020 18:55",
"initialize" : "BrunoBB 07/03/2016 08:49",
"initializeNavigation" : "brunobb 07/11/2019 03:16",
"logout" : "BrunoBB 07/03/2016 08:57",
"logout" : "brunobb 08/19/2021 11:59",
"renderSwitchPortalIconsOn:" : "brunobb 07/05/2019 09:10",
"setServersConfiguration" : "brunobb 05/08/2020 18:28",
"style2" : "BrunoBB 09/20/2016 13:33",
Expand Down
2 changes: 1 addition & 1 deletion ...sitory/OrbeonWeb.package/WAOrbeonApplicationSummary.class/instance/generateEditUrlFor..st
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
instance redirect
generateEditUrlFor: anOrbeonFormInstance

^self getOrbeonWebServerConfiguration orbeonIP, '/orbeon/fr/', anOrbeonFormInstance getApplicationName, '/', anOrbeonFormInstance getFormName, '/edit/', anOrbeonFormInstance id
^self session systemRoot generateEditUrlFor: anOrbeonFormInstance
2 changes: 1 addition & 1 deletion ...eonWeb.package/WAOrbeonApplicationSummary.class/instance/generateEditUrlForDefinition..st
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
definition redirect
generateEditUrlForDefinition: anOrbeonPublishedFormDefinition

^OrbeonServerConfiguration default orbeonIP, '/orbeon/fr/orbeon/builder/edit/', anOrbeonPublishedFormDefinition id
^self session systemRoot generateEditUrlForDefinition: anOrbeonPublishedFormDefinition
2 changes: 1 addition & 1 deletion ...beonWeb.package/WAOrbeonApplicationSummary.class/instance/generateNewUrlForDefinition..st
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
definition redirect
generateNewUrlForDefinition: anOrbeonPublishedFormDefinition

^OrbeonServerConfiguration default orbeonIP, '/orbeon/fr/orbeon/builder/new'
^self session systemRoot generateNewUrlForDefinition: anOrbeonPublishedFormDefinition
2 changes: 1 addition & 1 deletion ...ory/OrbeonWeb.package/WAOrbeonApplicationSummary.class/instance/generateViewPdfUrlFor..st
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
instance redirect
generateViewPdfUrlFor: anOrbeonFormInstance

^self getOrbeonWebServerConfiguration orbeonIP, '/orbeon/fr/', anOrbeonFormInstance getApplicationName, '/', anOrbeonFormInstance getFormName, '/pdf/', anOrbeonFormInstance id
^self session systemRoot generateViewPdfUrlFor: anOrbeonFormInstance
2 changes: 1 addition & 1 deletion ...sitory/OrbeonWeb.package/WAOrbeonApplicationSummary.class/instance/generateViewUrlFor..st
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
instance redirect
generateViewUrlFor: anOrbeonFormInstance

^self getOrbeonWebServerConfiguration orbeonIP, '/orbeon/fr/', anOrbeonFormInstance getApplicationName, '/', anOrbeonFormInstance getFormName, '/view/', anOrbeonFormInstance id
^self session systemRoot generateViewUrlFor: anOrbeonFormInstance
10 changes: 5 additions & 5 deletions repository/OrbeonWeb.package/WAOrbeonApplicationSummary.class/methodProperties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@
"exportComponent" : "BrunoBB 07/03/2016 13:41",
"exportComponent:" : "BrunoBB 07/03/2016 13:41",
"exportToCSV" : "brunobb 05/08/2020 18:43",
"generateEditUrlFor:" : "brunobb 07/16/2019 03:56",
"generateEditUrlForDefinition:" : "brunobb 07/05/2019 11:53",
"generateNewUrlForDefinition:" : "brunobb 07/05/2019 11:54",
"generateViewPdfUrlFor:" : "brunobb 07/16/2019 03:56",
"generateViewUrlFor:" : "brunobb 07/16/2019 03:56",
"generateEditUrlFor:" : "brunobb 08/17/2021 13:17",
"generateEditUrlForDefinition:" : "brunobb 08/16/2021 12:31",
"generateNewUrlForDefinition:" : "brunobb 08/16/2021 12:31",
"generateViewPdfUrlFor:" : "brunobb 08/17/2021 13:17",
"generateViewUrlFor:" : "brunobb 08/17/2021 13:18",
"getCurrentCollection" : "BrunoBB 07/03/2016 11:26",
"getDefinitionsCollection" : "brunobb 07/12/2019 11:45",
"getIconNameFormItem" : "BrunoBB 07/03/2016 11:44",
Expand Down
2 changes: 1 addition & 1 deletion repository/OrbeonWeb.package/WAOrbeonApplicationsComposite.class/instance/gitbookUrl.st
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
other
gitbookUrl

^self getGemStoneServerConfiguration baseUrlDocumentation, '/orbeon-integration/persistence-layer-backoffice/orbeon-application-viewer'
^self session systemRoot baseUrlDocumentation, '/orbeon-integration/persistence-layer-backoffice/orbeon-application-viewer'
2 changes: 1 addition & 1 deletion repository/OrbeonWeb.package/WAOrbeonApplicationsComposite.class/methodProperties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"class" : {
},
"instance" : {
"gitbookUrl" : "brunobb 03/25/2020 12:12",
"gitbookUrl" : "brunobb 08/19/2021 11:59",
"renderContentOn:" : "BrunoBB 07/29/2016 08:52",
"summaryArena" : "BrunoBB 07/03/2016 09:38",
"summaryArena:" : "BrunoBB 07/03/2016 09:38" } }
2 changes: 1 addition & 1 deletion repository/OrbeonWeb.package/WAOrbeonGraphicsComposite.class/instance/gitbookUrl.st
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
other
gitbookUrl

^self getGemStoneServerConfiguration baseUrlDocumentation, '/orbeon-integration/persistence-layer-backoffice/create-charts-with-highcharts'
^self session systemRoot baseUrlDocumentation, '/orbeon-integration/persistence-layer-backoffice/create-charts-with-highcharts'
2 changes: 1 addition & 1 deletion repository/OrbeonWeb.package/WAOrbeonGraphicsComposite.class/methodProperties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"getScopeValue" : "brunobb 05/08/2020 18:48",
"getStartDate" : "brunobb 05/15/2020 10:21",
"getVersion" : "brunobb 05/08/2020 18:48",
"gitbookUrl" : "brunobb 05/08/2020 18:48",
"gitbookUrl" : "brunobb 08/19/2021 11:59",
"hasAllVersionsSelected" : "brunobb 05/08/2020 18:48",
"initialize" : "brunobb 05/22/2020 09:59",
"initializeBatchedLists" : "brunobb 05/08/2020 18:48",
Expand Down
2 changes: 1 addition & 1 deletion ...sitory/OrbeonWeb.package/WAOrbeonImportFromDatabaseComposite.class/instance/gitbookUrl.st
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
other
gitbookUrl

^self getGemStoneServerConfiguration baseUrlDocumentation, '/orbeon-integration/persistence-layer-backoffice/migrate-from-relational-database'
^self session systemRoot baseUrlDocumentation, '/orbeon-integration/persistence-layer-backoffice/migrate-from-relational-database'
2 changes: 1 addition & 1 deletion repository/OrbeonWeb.package/WAOrbeonImportFromDatabaseComposite.class/instance/importAll.st
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
migration operations
importAll

self getOrbeonWebServerConfiguration databaseMigrator migrateAll
self session systemRoot migrateAll
2 changes: 1 addition & 1 deletion ...eb.package/WAOrbeonImportFromDatabaseComposite.class/instance/importApplicationAndForm.st
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ importApplicationAndForm
applicationName := self componentValueAt: 'app-name'.
formName := self componentValueAt: 'form-name'.

self getOrbeonWebServerConfiguration databaseMigrator migrateFormDefinitionNamed: formName in: applicationName
self session systemRoot migrateFormDefinitionNamed: formName in: applicationName
2 changes: 1 addition & 1 deletion ...beonImportFromDatabaseComposite.class/instance/importApplicationAndFormVersionFromDate.st
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ importApplicationAndFormVersionFromDate
date := self componentValueAt: 'from-date'.
version := self componentValueAt: 'version'.

self getOrbeonWebServerConfiguration databaseMigrator updateFormDefinitionNamed: formName app: applicationName version: version from: (self converToTimeStamp: date)
self session systemRoot updateFormDefinitionNamed: formName app: applicationName version: version from: (self converToTimeStamp: date)
2 changes: 1 addition & 1 deletion ...AOrbeonImportFromDatabaseComposite.class/instance/importInstancesOfFormVersionFromDate.st
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ importInstancesOfFormVersionFromDate
application := self session systemRoot applicationNamed: applicationName ifNone: [^self].
form := application getDefinitionNamed: formName withVersion: version ifNone: [^self].

self getOrbeonWebServerConfiguration databaseMigrator migrateInstancesOf: form version: version from: (self converToTimeStamp: date).
self session systemRoot migrateInstancesOf: form version: version from: (self converToTimeStamp: date).
10 changes: 5 additions & 5 deletions repository/OrbeonWeb.package/WAOrbeonImportFromDatabaseComposite.class/methodProperties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
},
"instance" : {
"converToTimeStamp:" : "brunobb 05/27/2020 13:59",
"gitbookUrl" : "brunobb 05/08/2020 18:55",
"importAll" : "brunobb 05/08/2020 18:55",
"importApplicationAndForm" : "brunobb 05/08/2020 18:55",
"importApplicationAndFormVersionFromDate" : "brunobb 05/27/2020 13:57",
"importInstancesOfFormVersionFromDate" : "brunobb 07/22/2021 13:41",
"gitbookUrl" : "brunobb 08/19/2021 11:59",
"importAll" : "brunobb 08/17/2021 13:27",
"importApplicationAndForm" : "brunobb 08/17/2021 13:28",
"importApplicationAndFormVersionFromDate" : "brunobb 08/17/2021 13:29",
"importInstancesOfFormVersionFromDate" : "brunobb 08/17/2021 13:30",
"renderContentOn:" : "brunobb 05/08/2020 18:55",
"renderMigrateAllOn:" : "brunobb 05/08/2020 18:55",
"renderMigrateApplicationAndFormOn:" : "brunobb 05/08/2020 18:55",
Expand Down
2 changes: 1 addition & 1 deletion repository/OrbeonWeb.package/WAOrbeonLogin.class/instance/tryLogin.st
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ other
tryLogin
| logedUser loginMode |

loginMode := self getGemStoneServerConfiguration loginModeFor: 'orbeon-web'.
loginMode := self session systemRoot loginModeFor: 'orbeon-web'.
(loginMode validateUser: name password: password on: self session systemRoot) ifFalse: [^loginAttempts := loginAttempts + 1].

logedUser := OrbeonUser getExistingOrNewUserNamed: name.
Expand Down
2 changes: 1 addition & 1 deletion repository/OrbeonWeb.package/WAOrbeonLogin.class/methodProperties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@
"newUserFromLogin" : "BrunoBB 02/18/2014 04:12",
"renderEnvironmentComboOn:" : "brunobb 11/21/2018 10:24",
"renderSelectEnvironmentPaneOn:" : "brunobb 03/05/2020 08:52",
"tryLogin" : "brunobb 07/15/2021 14:26" } }
"tryLogin" : "brunobb 08/19/2021 12:00" } }
2 changes: 1 addition & 1 deletion ...itory/OrbeonWeb.package/WAOrbeonServerConfigurationComposite.class/instance/gitbookUrl.st
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
other
gitbookUrl

^self getGemStoneServerConfiguration baseUrlDocumentation, '/orbeon-integration/persistence-layer-backoffice/orbeon-server-configuration'
^self session systemRoot baseUrlDocumentation, '/orbeon-integration/persistence-layer-backoffice/orbeon-server-configuration'
8 changes: 4 additions & 4 deletions ...age/WAOrbeonServerConfigurationComposite.class/instance/renderGemStoneOrbeonSettingOn..st
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ renderGemStoneOrbeonSettingOn: html

html label attributeAt: 'for' put: 'orbeonIP'; with: ('Orbeon IP' translateIn: self session).
html textInput attributeAt: 'id' put: 'orbeonIP';
callback: [:value | self getOrbeonWebServerConfiguration orbeonIP: value];
with: self getOrbeonWebServerConfiguration orbeonIP.
callback: [:value | self session systemRoot orbeonIP: value];
with: self session systemRoot orbeonIP.
html label attributeAt: 'for' put: 'gemstoneIP'; with: ('GemStone/S IP' translateIn: self session).
html textInput attributeAt: 'id' put: 'gemstoneIP';
callback: [:value | self getGemStoneServerConfiguration gemstoneIP: value];
with: self getGemStoneServerConfiguration gemstoneIP.
callback: [:value | self session systemRoot gemstoneIP: value];
with: self session systemRoot gemstoneIP.

html label class: 'margin-right-10px'; attributeAt: 'for' put: 'dataFormatVersion'; with: ('Data Format Version' translateIn: self session).
html textInput
Expand Down
2 changes: 1 addition & 1 deletion ...age/WAOrbeonServerConfigurationComposite.class/instance/renderOrbeonDatabaseSettingOn..st
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ renderOrbeonDatabaseSettingOn: html
attributeAt: 'id' put: 'databaseName';
list: OrbeonDatabaseReader getAllDatabaseReadersComboNames;
callback: [:versionName | self setDatabaseName: versionName];
selected: self getOrbeonWebServerConfiguration getDatabaseReaderName.
selected: self session systemRoot getDatabaseReaderName.
html label attributeAt: 'for' put: 'databaseUser'; with: ('Database User' translateIn: self session).
html textInput attributeAt: 'id' put: 'databaseUser';
callback: [:value | self getOrbeonDatabaseConfiguration databaseUser: value];
Expand Down
2 changes: 1 addition & 1 deletion ...OrbeonWeb.package/WAOrbeonServerConfigurationComposite.class/instance/setDatabaseName..st
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
operations
setDatabaseName: databaseNameName

self getOrbeonWebServerConfiguration setDatabaseReaderFromDatabaseName: databaseNameName
self session systemRoot setDatabaseReaderFromDatabaseName: databaseNameName
4 changes: 0 additions & 4 deletions ...y/OrbeonWeb.package/WAOrbeonServerConfigurationComposite.class/instance/setFormReader..st
View file

This file was deleted.

4 changes: 0 additions & 4 deletions ...rbeonWeb.package/WAOrbeonServerConfigurationComposite.class/instance/setOrbeonVersion..st
View file

This file was deleted.

10 changes: 4 additions & 6 deletions ...sitory/OrbeonWeb.package/WAOrbeonServerConfigurationComposite.class/methodProperties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,10 @@
"class" : {
},
"instance" : {
"gitbookUrl" : "brunobb 05/08/2020 18:28",
"gitbookUrl" : "brunobb 08/19/2021 11:59",
"renderContentOn:" : "brunobb 05/08/2020 18:28",
"renderGemStoneOrbeonSettingOn:" : "brunobb 04/01/2021 12:51",
"renderOrbeonDatabaseSettingOn:" : "brunobb 05/08/2020 18:28",
"renderGemStoneOrbeonSettingOn:" : "brunobb 08/19/2021 11:59",
"renderOrbeonDatabaseSettingOn:" : "brunobb 08/17/2021 13:24",
"renderServerConfigurationFormOn:" : "brunobb 05/08/2020 18:28",
"savePreferences" : "brunobb 05/08/2020 18:28",
"setDatabaseName:" : "brunobb 05/08/2020 18:28",
"setFormReader:" : "brunobb 05/08/2020 18:28",
"setOrbeonVersion:" : "brunobb 05/08/2020 18:28" } }
"setDatabaseName:" : "brunobb 08/17/2021 13:23" } }
2 changes: 1 addition & 1 deletion repository/OrbeonWeb.package/monticello.meta/version
View file

Large diffs are not rendered by default.

0 comments on commit 375237a

Please sign in to comment.