Skip to content

Commit

Permalink
Merge pull request #931 from marianopeck/gemstone34
Browse files Browse the repository at this point in the history 
Fixes to make Seaside 3.2 load in GemStone 3.4
  • Loading branch information
Johan Brichau authored Jul 14, 2017
2 parents 04c528d + 8e82994 commit a5f19ea
Show file tree
Hide file tree
Showing 8 changed files with 44 additions and 35 deletions.
51 changes: 27 additions & 24 deletions ...itory/BaselineOfSeaside3.package/BaselineOfSeaside3.class/instance/baselinefilesystem..st
View file
Original file line number Diff line number Diff line change
@@ -1,26 +1,29 @@
baselines
baselinefilesystem: spec

spec for: #'squeakCommon' do: [

spec
package: 'Seaside-FileSystem' with: [ spec requires: #('Seaside-Core') ];
package: 'Seaside-Tests-FileSystem' with: [ spec requires: #('Seaside-FileSystem') ].

spec
group: 'Filesystem' with: #('Seaside-FileSystem' );
group: 'Filesystem Tests' with: #( 'Filesystem' 'Seaside-Tests-FileSystem');
group: 'Tests' with: #('Filesystem Tests')
].

spec for: #pharo do: [
spec
package: 'Seaside-Pharo-FileSystem';
package: 'Seaside-FileSystem' with: [ spec includes: 'Seaside-Pharo-FileSystem' ].
].

spec for: #'gemstone' do: [
spec
package: 'Seaside-GemStone-FileSystem';
package: 'Seaside-FileSystem' with: [
spec includes: 'Seaside-GemStone-FileSystem' ] ]
spec
for: #'common'
do: [
spec
package: 'Seaside-FileSystem'
with: [ spec requires: #('Seaside-Core') ];
package: 'Seaside-Tests-FileSystem'
with: [ spec requires: #('Seaside-FileSystem') ].
spec
group: 'Filesystem' with: #('Seaside-FileSystem');
group: 'Filesystem Tests'
with: #('Filesystem' 'Seaside-Tests-FileSystem');
group: 'Tests' with: #('Filesystem Tests') ].
spec
for: #'pharo'
do: [
spec
package: 'Seaside-Pharo-FileSystem';
package: 'Seaside-FileSystem'
with: [ spec includes: 'Seaside-Pharo-FileSystem' ] ].
spec
for: #'gemstone'
do: [
spec
package: 'Seaside-GemStone-FileSystem';
package: 'Seaside-FileSystem'
with: [ spec includes: 'Seaside-GemStone-FileSystem' ] ]
11 changes: 7 additions & 4 deletions repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/instance/baselinegemstone..st
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,23 @@ baselinegemstone: spec
repository: 'github://glassdb/glass:master/repository' ];
yourself.
spec
package: 'Seaside-Squeak-Compatibility';
package: 'Seaside-Squeak-Compatibility';
package: 'Seaside-Core'
with: [
spec
includes: #('Seaside-GemStone-Core');
requires: #('GLASS1' 'Seaside-Squeak-Compatibility') ];
requires: #('GLASS1' 'Seaside-Squeak-Compatibility') ];
package: 'Seaside-Development'
with: [ spec includes: #('Seaside-GemStone-Development') ];
package: 'Seaside-Email'
with: [ spec includes: #('Seaside-GemStone-Email') ];
package: 'Seaside-Flow'
with: [ spec includes: #('Seaside-GemStone-Flow') ];
package: 'Seaside-Environment'
with: [ spec includes: #('Seaside-GemStone-Environment' 'Seaside-GemStone-Tools-Production') ];
with: [
spec
includes:
#('Seaside-GemStone-Environment' 'Seaside-GemStone-Tools-Production') ];
package: 'Seaside-Session'
with: [ spec includes: #('Seaside-GemStone-Session') ];
package: 'Seaside-Tools-Web'
Expand Down Expand Up @@ -111,7 +114,7 @@ baselinegemstone: spec
package: 'Seaside-GemStone-Core'
with: [ spec requires: #('Seaside-GemStone300-Core') ] ].
spec
for: #(#'gs3.2.x' #'gs3.3.x')
for: #(#'gs3.2.x' #'gs3.3.x' #'gs3.4.x')
do: [
spec
package: 'Seaside-Core'
Expand Down
4 changes: 2 additions & 2 deletions repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/methodProperties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"baselineadaptors:" : "JohanBrichau 3/28/2016 14:31",
"baselinecomet:" : "JohanBrichau 2/15/2014 11:48",
"baselinecommon:" : "JohanBrichau 5/26/2017 11:09",
"baselinefilesystem:" : "JohanBrichau 8/27/2015 15:24",
"baselinegemstone:" : "JohanBrichau 3/26/2016 15:31",
"baselinefilesystem:" : "MarianoMartinezPeck 07/11/2017 12:46",
"baselinegemstone:" : "MarianoMartinezPeck 07/11/2017 14:16",
"baselinegettext:" : "JohanBrichau 3/20/2016 15:51",
"baselinejavascript:" : "CyrilFerlicot 1/16/2017 11:36",
"baselinejquery:" : "JohanBrichau 2/15/2014 11:47",
Expand Down
2 changes: 1 addition & 1 deletion repository/BaselineOfSeaside3.package/monticello.meta/categories.st
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
SystemOrganization addCategory: #BaselineOfSeaside3!
SystemOrganization addCategory: #'BaselineOfSeaside3'!
2 changes: 1 addition & 1 deletion repository/BaselineOfSeaside3.package/monticello.meta/version
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
(name 'BaselineOfSeaside3-CyrilFerlicot.60' message 'merged by GitFileTree-MergeDriver' id 'b9b3f095-2c98-4b81-b038-bea516afdc18' date '10 June 2017' time '10:28:43.967859 am' author 'CyrilFerlicot' ancestors ((name 'BaselineOfSeaside3-JohanBrichau.59' message 'Use Github Grease' id 'b62b1ae6-109c-400a-819a-5f7bab023ed0' date '26 May 2017' time '11:09:43.344009 am' author 'JohanBrichau' ancestors ((name 'BaselineOfSeaside3-pmm.58' message 'merged by GitFileTree-MergeDriver' id 'd73a056d-bb29-4870-b6ae-1950370049ef' date '25 May 2017' time '3:17:05.631997 pm' author 'pmm' ancestors ((name 'BaselineOfSeaside3-pmm.57' message 'merged by GitFileTree-MergeDriver' id '471dd5e3-b2dc-416e-ad32-bb31c5041f14' date '23 October 2016' time '1:29:54.374228 pm' author 'pmm' ancestors ((name 'BaselineOfSeaside3-pmm.56' message 'Add REST examples from 2014Baseline update for #891' id '00d55504-a6f7-421d-a17d-fec6d1d862f1' date '10 September 2016' time '3:12:58.814625 pm' author 'pmm' ancestors ((name 'BaselineOfSeaside3-pmm.55' message 'Seaside-Examples should depend on JQueryFixes #893' id '8308f4c4-316a-4d78-8c4e-6d970c7f3009' date '10 September 2016' time '1:52:24.799462 pm' author 'pmm' ancestors ((name 'BaselineOfSeaside3-pmm.54' message '- enable security tests' id 'ad352d1f-4f58-40e6-a703-8620cb88ee40' date '25 August 2016' time '4:21:36.134069 pm' author 'pmm' ancestors ((name 'BaselineOfSeaside3-pmm.53' message '- squeak parts in Squeak baseline' id '29209152-1871-45e0-9486-b1e563857bde' date '24 August 2016' time '3:02:44.258779 pm' author 'pmm' ancestors ((name 'BaselineOfSeaside3-JohanBrichau.52' message 'Fix inclusion of JQuery-Tests in the Welcome group because it contains the examples referenced in the welcome site' id '61b629c8-8a56-4414-9053-f3c0d3c6bdbe' date '15 May 2016' time '10:20:46.149684 am' author 'JohanBrichau' ancestors ((name 'BaselineOfSeaside3-JohanBrichau.51' message 'Added Welcome and Examples package to default load' id 'c259c565-776b-4cec-b8a8-0283bbee2310' date '5 May 2016' time '5:34:45 am' author 'JohanBrichau' ancestors ((name 'BaselineOfSeaside3-JohanBrichau.50' message 'include Examples and Welcome in default load' id 'ea155c65-418b-4b3a-9790-43195adab1dc' date '5 May 2016' time '5:33:34 am' author 'JohanBrichau' ancestors ((name 'BaselineOfSeaside3-JohanBrichau.49' message 'https://github.com/GsDevKit/Seaside31/issues/81' id '8be6f474-1c61-4581-ba71-24bba35bbe7a' date '28 March 2016' time '2:32:23 am' author 'JohanBrichau' ancestors ((name 'BaselineOfSeaside3-JohanBrichau.48' message 'fix loading in Gemstone' id '1d00bac7-656e-4fb3-8a75-4f6bcfefd8f4' date '26 March 2016' time '3:32:19 am' author 'JohanBrichau' ancestors ((name 'BaselineOfSeaside3-JohanBrichau.47' message 'Sync with configurationOf for changes to Pharo50' id 'cd3c9a0f-aac6-4a69-bfbb-39978006881a' date '26 March 2016' time '3:22:03 am' author 'JohanBrichau' ancestors ((name 'BaselineOfSeaside3-JohanBrichau.46' message 'strange typos' id '174b49db-200a-423a-b259-a33b2a39d720' date '20 March 2016' time '4:26:56 am' author 'JohanBrichau' ancestors ((name 'BaselineOfSeaside3-JohanBrichau.45' message 'fix baseline for squeak' id 'a81595ad-59d3-49c2-9876-28b8f5f9b8ad' date '20 March 2016' time '4:22:12 am' author 'JohanBrichau' ancestors ((name 'BaselineOfSeaside3-JohanBrichau.44' message 'Added pharo5' id 'ba971228-0195-4582-bf93-0ae8bf04ffc0' date '20 March 2016' time '3:56:25 am' author 'JohanBrichau' ancestors ((name 'BaselineOfSeaside3-JohanBrichau.43' message 'correcting swagger for Squeak' id '81188dbc-27a1-4ef2-aeb4-4872d1947921' date '28 August 2015' time '5:10:01 am' author 'JohanBrichau' ancestors ((name 'BaselineOfSeaside3-JohanBrichau.42' message 'added squeak-swagger-core' id '3725f91a-8ff1-4604-8640-b976a43efaa7' date '28 August 2015' time '5:01:16 am' author 'JohanBrichau' ancestors ((name 'BaselineOfSeaside3-JohanBrichau.41' message 'Removed reference of Seaside-Tools-Core.gemstone ' id '9cb5d2a7-0294-4d87-b567-899f078e9aa1' date '28 August 2015' time '2:53:46 am' author 'JohanBrichau' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())(name 'BaselineOfSeaside3-JohanBrichau.53' message 'fixes to baseline security' id '7b2176f4-2f7b-4774-ae53-21296ee79026' date '16 September 2016' time '8:58:21.606431 am' author 'JohanBrichau' ancestors ((id '61b629c8-8a56-4414-9053-f3c0d3c6bdbe')) stepChildren ())) stepChildren ())(name 'BaselineOfSeaside3-CyrilFerlicot.54' message 'Adapt baseline to Pharo 6.' id '0c00a24e-9548-4e69-9f57-9749c28e0eaa' date '16 January 2017' time '11:37:20.683537 am' author 'CyrilFerlicot' ancestors ((id '7b2176f4-2f7b-4774-ae53-21296ee79026')) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())
(name 'BaselineOfSeaside3-MarianoMartinezPeck.61' message '* BaselineOfSeaside3>>baselinefilesystem: should include ''Filesystem'' groups for #common rather than #squeakCommon.* Added GemStone 3.4 attributes to BaselineOfSeaside3>>baselinegemstone:.' id '1d75663c-3526-48ec-96e1-02442d65b4a5' date '07/11/2017' time '14:22:49' author 'MarianoMartinezPeck' ancestors ((name 'BaselineOfSeaside3-CyrilFerlicot.60' message 'merged by GitFileTree-MergeDriver' id 'b9b3f095-2c98-4b81-b038-bea516afdc18' date '06/10/2017' time '10:28:43' author 'CyrilFerlicot' ancestors ((name 'BaselineOfSeaside3-JohanBrichau.59' message 'Use Github Grease' id 'b62b1ae6-109c-400a-819a-5f7bab023ed0' date '05/26/2017' time '11:09:43' author 'JohanBrichau' ancestors ((name 'BaselineOfSeaside3-pmm.58' message 'merged by GitFileTree-MergeDriver' id 'd73a056d-bb29-4870-b6ae-1950370049ef' date '05/25/2017' time '03:17:05' author 'pmm' ancestors ((name 'BaselineOfSeaside3-pmm.57' message 'merged by GitFileTree-MergeDriver' id '471dd5e3-b2dc-416e-ad32-bb31c5041f14' date '10/23/2016' time '01:29:54' author 'pmm' ancestors ((name 'BaselineOfSeaside3-pmm.56' message 'Add REST examples from 2014Baseline update for #891' id '00d55504-a6f7-421d-a17d-fec6d1d862f1' date '09/10/2016' time '03:12:58' author 'pmm' ancestors ((name 'BaselineOfSeaside3-pmm.55' message 'Seaside-Examples should depend on JQueryFixes #893' id '8308f4c4-316a-4d78-8c4e-6d970c7f3009' date '09/10/2016' time '01:52:24' author 'pmm' ancestors ((name 'BaselineOfSeaside3-pmm.54' message '- enable security tests' id 'ad352d1f-4f58-40e6-a703-8620cb88ee40' date '08/25/2016' time '04:21:36' author 'pmm' ancestors ((name 'BaselineOfSeaside3-pmm.53' message '- squeak parts in Squeak baseline' id '29209152-1871-45e0-9486-b1e563857bde' date '08/24/2016' time '03:02:44' author 'pmm' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())(name 'BaselineOfSeaside3-CyrilFerlicot.54' message 'Adapt baseline to Pharo 6.' id '0c00a24e-9548-4e69-9f57-9749c28e0eaa' date '01/16/2017' time '11:37:20' author 'CyrilFerlicot' ancestors ((name 'BaselineOfSeaside3-JohanBrichau.53' message 'fixes to baseline security' id '7b2176f4-2f7b-4774-ae53-21296ee79026' date '09/16/2016' time '08:58:21' author 'JohanBrichau' ancestors ((name 'BaselineOfSeaside3-JohanBrichau.52' message 'Fix inclusion of JQuery-Tests in the Welcome group because it contains the examples referenced in the welcome site' id '61b629c8-8a56-4414-9053-f3c0d3c6bdbe' date '05/15/2016' time '10:20:46' author 'JohanBrichau' ancestors ((name 'BaselineOfSeaside3-JohanBrichau.51' message 'Added Welcome and Examples package to default load' id 'c259c565-776b-4cec-b8a8-0283bbee2310' date '05/05/2016' time '05:34:45' author 'JohanBrichau' ancestors ((name 'BaselineOfSeaside3-JohanBrichau.50' message 'include Examples and Welcome in default load' id 'ea155c65-418b-4b3a-9790-43195adab1dc' date '05/05/2016' time '05:33:34' author 'JohanBrichau' ancestors ((name 'BaselineOfSeaside3-JohanBrichau.49' message 'https://github.com/GsDevKit/Seaside31/issues/81' id '8be6f474-1c61-4581-ba71-24bba35bbe7a' date '03/28/2016' time '02:32:23' author 'JohanBrichau' ancestors ((name 'BaselineOfSeaside3-JohanBrichau.48' message 'fix loading in Gemstone' id '1d00bac7-656e-4fb3-8a75-4f6bcfefd8f4' date '03/26/2016' time '03:32:19' author 'JohanBrichau' ancestors ((name 'BaselineOfSeaside3-JohanBrichau.47' message 'Sync with configurationOf for changes to Pharo50' id 'cd3c9a0f-aac6-4a69-bfbb-39978006881a' date '03/26/2016' time '03:22:03' author 'JohanBrichau' ancestors ((name 'BaselineOfSeaside3-JohanBrichau.46' message 'strange typos' id '174b49db-200a-423a-b259-a33b2a39d720' date '03/20/2016' time '04:26:56' author 'JohanBrichau' ancestors ((name 'BaselineOfSeaside3-JohanBrichau.45' message 'fix baseline for squeak' id 'a81595ad-59d3-49c2-9876-28b8f5f9b8ad' date '03/20/2016' time '04:22:12' author 'JohanBrichau' ancestors ((name 'BaselineOfSeaside3-JohanBrichau.44' message 'Added pharo5' id 'ba971228-0195-4582-bf93-0ae8bf04ffc0' date '03/20/2016' time '03:56:25' author 'JohanBrichau' ancestors ((name 'BaselineOfSeaside3-JohanBrichau.43' message 'correcting swagger for Squeak' id '81188dbc-27a1-4ef2-aeb4-4872d1947921' date '08/28/2015' time '05:10:01' author 'JohanBrichau' ancestors ((name 'BaselineOfSeaside3-JohanBrichau.42' message 'added squeak-swagger-core' id '3725f91a-8ff1-4604-8640-b976a43efaa7' date '08/28/2015' time '05:01:16' author 'JohanBrichau' ancestors ((name 'BaselineOfSeaside3-JohanBrichau.41' message 'Removed reference of Seaside-Tools-Core.gemstone ' id '9cb5d2a7-0294-4d87-b567-899f078e9aa1' date '08/28/2015' time '02:53:46' author 'JohanBrichau' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())
Expand Down
5 changes: 4 additions & 1 deletion ...Seaside-GemStone-FileSystem.package/GRGemStonePlatform.extension/instance/fileNameFor..st
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
*seaside-gemstone-filesystem
fileNameFor: aPathString
^ (FileDirectory forFileName: aPathString) pathName
"aa
"

^ (FileDirectory on: aPathString) pathName
2 changes: 1 addition & 1 deletion ...ry/Seaside-GemStone-FileSystem.package/GRGemStonePlatform.extension/methodProperties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
},
"instance" : {
"defaultDirectoryPathString" : "JohanBrichau 07/23/2015 07:43",
"fileNameFor:" : "JohanBrichau 07/23/2015 07:46",
"fileNameFor:" : "MarianoMartinezPeck 07/11/2017 14:18",
"isDirectory:" : "JohanBrichau 07/23/2015 07:47" } }
2 changes: 1 addition & 1 deletion repository/Seaside-GemStone-FileSystem.package/monticello.meta/version
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
(name 'Seaside-GemStone-FileSystem-JohanBrichau.1' message 'Platform-specific messages' id 'be4b9d3b-f364-442c-a815-84093ef24913' date '07/23/2015' time '07:48:36' author 'JohanBrichau' ancestors () stepChildren ())
(name 'Seaside-GemStone-FileSystem-MarianoMartinezPeck.2' message '* Change GRGemStonePlatform>>fileNameFor: from #forFileName: to #on: to fix tests WAExternalFileLibraryTest >> testFileNameFor and testPathForRequest.' id 'ba7ce80c-90ea-428b-be3e-92ea3a8ff647' date '07/11/2017' time '14:21:28' author 'MarianoMartinezPeck' ancestors ((name 'Seaside-GemStone-FileSystem-JohanBrichau.1' message 'Platform-specific messages' id 'be4b9d3b-f364-442c-a815-84093ef24913' date '07/23/2015' time '07:48:36' author 'JohanBrichau' ancestors () stepChildren ())) stepChildren ())
Expand Down

0 comments on commit a5f19ea

Please sign in to comment.