Skip to content

Commit

Permalink
Merge pull request #896 from SeasideSt/securitypackage-fix
Browse files Browse the repository at this point in the history 
fixes to loading of seaside-security (by Esteban)
  • Loading branch information
@jbrichau
jbrichau authored Sep 16, 2016
2 parents 914b5c0 + 5217843 commit 2c54d82
Show file tree
Hide file tree
Showing 13 changed files with 43 additions and 47 deletions.
60 changes: 31 additions & 29 deletions repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/instance/baselinesecurity..st
View file
Original file line number Diff line number Diff line change
@@ -1,31 +1,33 @@
baselines
baselinesecurity: spec

spec for: #'squeakCommon' do: [

spec
package: 'Cryptography' with:[
spec repository: 'http://smalltalkhub.com/mc/Cryptography/Cryptography/main' ].

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

spec
package: 'Seaside-Pharo-Security';
package: 'Seaside-Security' with: [
spec
requires: #('Cryptography');
includes: #('Seaside-Pharo-Security').
].
spec
package: 'Seaside-Tests-Pharo-Security';
package: 'Seaside-Tests-Security' with: [
spec includes: #('Seaside-Tests-Pharo-Security') ].

spec
group: 'Security' with: #('Seaside-Security')
"group: 'Tests' with: #('Seaside-Tests-Security') "
]
spec
for: #pharo
do: [ spec package: 'Cryptography' with: [ spec repository: 'http://mc.smalltalkhub.com/mc/Cryptography/Cryptography/main' ].
spec
package: 'Seaside-Security'
with: [ spec
requires: #('Seaside-Core' 'Cryptography');
includes: #('Seaside-Pharo-Security') ];
package: 'Seaside-Pharo-Security';
package: 'Seaside-Tests-Security' with: [ spec requires: #('Seaside-Security') ].
spec
package: 'Seaside-Tests-Security' with: [ spec includes: #('Seaside-Tests-Pharo-Security') ];
package: 'Seaside-Tests-Pharo-Security' ].
spec
for: #squeak
do: [ spec package: 'Cryptography' with: [ spec repository: 'http://www.squeaksource.com/Cryptography' ].
spec
package: 'Seaside-Security'
with: [ spec
requires: #('Seaside-Core' 'Cryptography');
includes: #('Seaside-Pharo-Security') ];
package: 'Seaside-Pharo-Security';
package: 'Seaside-Tests-Security' with: [ spec requires: #('Seaside-Security') ].
spec
package: 'Seaside-Tests-Security' with: [ spec includes: #('Seaside-Tests-Pharo-Security') ];
package: 'Seaside-Tests-Pharo-Security' ].
spec
for: #squeakCommon
do: [ spec
group: 'Security' with: #('Seaside-Security');
group: 'Security Tests' with: #('Seaside-Tests-Security') ]
2 changes: 1 addition & 1 deletion repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/methodProperties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"baselinerest:" : "JohanBrichau 3/20/2016 15:53",
"baselinerss:" : "JohanBrichau 2/15/2014 11:46",
"baselinescriptaculous:" : "JohanBrichau 2/15/2014 11:46",
"baselinesecurity:" : "JohanBrichau 8/27/2015 14:31",
"baselinesecurity:" : "JohanBrichau 9/16/2016 08:57",
"baselineslime:" : "JohanBrichau 3/20/2016 15:54",
"baselinesqueak:" : "JohanBrichau 3/20/2016 16:26",
"baselinewelcome:" : "JohanBrichau 5/15/2016 10:20" } }
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-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 ())
(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 ((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 ())
2 changes: 1 addition & 1 deletion repository/Seaside-Core.package/GRPlatform.extension/instance/seasideVersion.st
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
seasideVersion
"Answer the Seaside version"

^ (GRVersion major: 3 minor: 1 revision: 2)
^ (GRVersion major: 3 minor: 2 revision: 1)
yourself
2 changes: 1 addition & 1 deletion repository/Seaside-Core.package/GRPlatform.extension/methodProperties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"doCommitTransaction" : "JohanBrichau 7/16/2015 11:19",
"newReducedConflictCounter" : "pmm 7/14/2015 18:29",
"newTransientValueHolder" : "pmm 7/14/2015 18:29",
"seasideVersion" : "JohanBrichau 6/13/2014 22:00",
"seasideVersion" : "JohanBrichau 9/16/2016 09:12",
"sourceFileEncoding" : "pmm 8/2/2011 20:55",
"urlEncoderOn:" : "pmm 8/14/2011 17:54",
"urlEncoderOn:codec:" : "pmm 8/14/2011 21:44",
Expand Down
3 changes: 3 additions & 0 deletions repository/Seaside-Core.package/WAKeyGenerator.class/class/current..st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
accessing
current: aWAKeyGenerator
current := aWAKeyGenerator
1 change: 1 addition & 0 deletions repository/Seaside-Core.package/WAKeyGenerator.class/methodProperties.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"class" : {
"current" : "lr 4/22/2009 19:59",
"current:" : "EstebanMaringolo 9/15/2016 23:33",
"initialize" : "pmm 1/10/2009 16:04" },
"instance" : {
"generator:" : "lr 1/10/2009 12:22",
Expand Down
2 changes: 1 addition & 1 deletion repository/Seaside-Core.package/WARegistryConfiguration.class/methodProperties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
},
"instance" : {
"describeOn:" : "pmm 7/16/2011 17:37",
"parents" : "pmm 7/12/2015 19:10" } }
"parents" : "jf 1/30/2009 10:57" } }
Loading

0 comments on commit 2c54d82

Please sign in to comment.