Skip to content

Commit

Permalink
Merge pull request SeasideSt#975 from marschall/fix-rest-dependencies
Browse files Browse the repository at this point in the history
Update dependencies
  • Loading branch information
marschall committed Sep 9, 2017
2 parents e9bb9dc + 47c841c commit df7afdf
Show file tree
Hide file tree
Showing 26 changed files with 100 additions and 104 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,8 @@ The '... Tests' group include the test packages for the named group. Usually the
The '... Examples' group include the examples packages for the named group

- 'Core' is the absolute minimum set of packages that should be
loaded to get expected Seaside functionality
loaded to get expected traditional Seaside functionality with
components and session.
- 'Development' adds in the Seaside development tools. It should be
noted that it is not recommended that the Seaside development tools
be loaded in a production image, because the tools are not considered
Expand All @@ -67,12 +68,12 @@ You must choose at least one adaptor (Seaside-Adaptors-Swazoo or Seaside-Adaptor
theory the absolute minimum loadable unit for Seaside30 would be:

BaselineOfSeaside3 project
load: #('Core' 'Kom').
load: #('Core' 'Zinc').

Note that there are no pre-defined components registered in this case,
so even if you manually start WAKom:

WAKom startOn: 8080
ZnZincServerAdaptor startOn: 8080

the only page you can hit is the files page:

Expand All @@ -91,8 +92,8 @@ but without the familiar development tools you might not have an
enjoyable experience. You can add in the development tools with the
following expression:

(ConfigurationOfSeaside3 project version: '3.1.0')
load: #('Development').
BaselineOfSeaside3 project
load: #('Development').

Only then will you see the familiar Dispatcher page when you hit:

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ baselinerest: spec
package: 'Seaside-Tests-Swagger-Core' with: [
spec requires: #('Seaside-Tests-REST-Core' 'Seaside-Swagger-Core') ].
spec
group: 'REST' with: #('Core' 'Seaside-REST-Core');
group: 'REST' with: #('Seaside-REST-Core');
group: 'Swagger' with: #('REST' 'Seaside-Swagger-Core');
group: 'REST Tests' with: #('REST' 'Seaside-Tests-REST-Core');
group: 'Swagger Tests' with: #('Swagger' 'Seaside-Tests-Swagger-Core')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"baselinecommon:" : "JohanBrichau 5/26/2017 11:09",
"baselineadaptors:" : "JohanBrichau 3/28/2016 14:31",
"baselinejson:" : "JohanBrichau 2/15/2014 11:47",
"baselinerest:" : "CyrilFerlicot 1/16/2017 11:36",
"baselinerest:" : "pmm 9/9/2017 10:11",
"baselineslime:" : "CyrilFerlicot 1/16/2017 11:37",
"baselinescriptaculous:" : "JohanBrichau 2/15/2014 11:46",
"baselinerss:" : "JohanBrichau 2/15/2014 11:46",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"commentStamp" : "pmm 9/8/2017 17:55",
"commentStamp" : "pmm 9/9/2017 10:14",
"super" : "BaselineOf",
"category" : "BaselineOfSeaside3",
"classinstvars" : [ ],
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
(name 'BaselineOfSeaside3-pmm.65' message 'Add class comment from configuration' id '4edd0230-1215-0d00-9407-7f5504aeb9ca' date '8 September 2017' time '6:55:56.327453 pm' author 'pmm' ancestors ((name 'BaselineOfSeaside3-pmm.64' message '- dependencies match GRPackage' id '37e3055a-e314-0d00-89f7-8f8c05a73cf9' date '6 September 2017' time '11:03:17.705776 am' author 'pmm' ancestors ((name 'BaselineOfSeaside3-pmm.63' message 'Fix dependencies of Welcome group' id '5758ff23-e314-0d00-aa63-e96f0685836e' date '6 September 2017' time '10:48:11.307299 am' author 'pmm' ancestors ((name 'BaselineOfSeaside3-JohanBrichau.62' message 'merged by GitFileTree-MergeDriver' id 'd6840ca4-3700-41b1-aaef-739258a31677' date '14 July 2017' time '11:57:59.937223 am' author 'JohanBrichau' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())
(name 'BaselineOfSeaside3-pmm.66' message 'remove dependency from REST group to Core group- #958' id '6fe9274c-2015-0d00-a9c6-12fb0180d057' date '9 September 2017' time '11:45:58.05962 am' author 'pmm' ancestors ((name 'BaselineOfSeaside3-pmm.65' message 'Add class comment from configuration' id '4edd0230-1215-0d00-9407-7f5504aeb9ca' date '8 September 2017' time '6:55:56.327453 pm' author 'pmm' ancestors ((name 'BaselineOfSeaside3-pmm.64' message '- dependencies match GRPackage' id '37e3055a-e314-0d00-89f7-8f8c05a73cf9' date '6 September 2017' time '11:03:17.705776 am' author 'pmm' ancestors ((name 'BaselineOfSeaside3-pmm.63' message 'Fix dependencies of Welcome group' id '5758ff23-e314-0d00-aa63-e96f0685836e' date '6 September 2017' time '10:48:11.307299 am' author 'pmm' ancestors ((name 'BaselineOfSeaside3-JohanBrichau.62' message 'merged by GitFileTree-MergeDriver' id 'd6840ca4-3700-41b1-aaef-739258a31677' date '14 July 2017' time '11:57:59.937223 am' author 'JohanBrichau' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,5 @@ class initialization
configureApplicationExceptionHandlingDefaults
(configuredExceptionHandlingDefaults ifNil: [ false ]) ifFalse: [
WAAdmin applicationExceptionHandlingDefaults
at: #exceptionHandler put: WAWalkbackErrorHandler.
configuredExceptionHandlingDefaults := true ]

at: #exceptionHandler put: self.
configuredExceptionHandlingDefaults := true ]
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
initialization
class initialization
initialize
WAAdmin applicationExceptionHandlingDefaults at: #exceptionHandler put: self
self configureApplicationExceptionHandlingDefaults
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"shouldCall" : "pmm 9/14/2011 20:07"
},
"class" : {
"initialize" : "lr 9/5/2009 10:49"
"initialize" : "pmm 9/9/2017 10:29",
"configureApplicationExceptionHandlingDefaults" : "pmm 9/9/2017 10:29"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@
"commentStamp" : "jf 10/27/2008 22:44",
"super" : "WADebugErrorHandler",
"category" : "Seaside-Development-Core",
"classinstvars" : [ ],
"classinstvars" : [
"configuredExceptionHandlingDefaults"
],
"pools" : [ ],
"classvars" : [ ],
"instvars" : [ ],
Expand Down

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions repository/Seaside-Environment.package/.filetree
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"noMethodMetaData" : true,
"separateMethodMetaAndSource" : false,
"useCypressPropertiesFile" : true }
"noMethodMetaData" : true,
"useCypressPropertiesFile" : true
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"instance" : { },
"class" : {
"seasideEnvironment" : "jf 6/24/2010 12:36" },
"instance" : {
} }
"seasideEnvironment" : "jf 6/24/2010 12:36"
}
}
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
{
"name" : "GRPackage" }
"name" : "GRPackage"
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
class initialization
initialize
self configureApplicationDefaults.
self configureApplicationExceptionHandlingDefaults.
self registerDefaultRequestHandlers.
self registerDefaultComponents
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"instance" : { },
"class" : {
"initialize" : "pmm 9/9/2017 10:29",
"configureApplicationDefaults" : "pmm 8/23/2014 14:52",
"configureApplicationExceptionHandlingDefaults" : "JohanBrichau 12/24/2015 08:33",
"initialize" : "jf 3/15/2009 18:51",
"registerDefaultComponents" : "jf 3/15/2009 18:47",
"registerDefaultRequestHandlers" : "jf 11/24/2009 22:18",
"reloadApplications" : "jf 3/15/2009 18:51" },
"instance" : {
} }
"reloadApplications" : "jf 3/15/2009 18:51"
}
}
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
{
"commentStamp" : "",
"super" : "WAObject",
"category" : "Seaside-Environment",
"classinstvars" : [
"configuredApplicationDefaults",
"configuredExceptionHandlingDefaults" ],
"classvars" : [
],
"commentStamp" : "",
"instvars" : [
],
"configuredApplicationDefaults"
],
"pools" : [ ],
"classvars" : [ ],
"instvars" : [ ],
"name" : "WAEnvironment",
"pools" : [
],
"super" : "WAObject",
"type" : "normal" }
"type" : "normal"
}
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
{
"class" : {
},
"instance" : {
"handleDefault:" : "jf 8/31/2009 19:56",
"renderContentForException:on:" : "jf 11/10/2008 10:04",
"rendererClass" : "as 2/6/2011 22:05",
"titleForException:" : "jf 9/14/2008 20:28",
"updateHtmlRoot:forException:" : "jf 8/31/2009 19:58" } }
"updateHtmlRoot:forException:" : "jf 8/31/2009 19:58",
"renderContentForException:on:" : "jf 11/10/2008 10:04",
"handleDefault:" : "jf 8/31/2009 19:56",
"titleForException:" : "jf 9/14/2008 20:28"
},
"class" : { }
}
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
{
"category" : "Seaside-Environment",
"classinstvars" : [
],
"classvars" : [
],
"commentStamp" : "jf 11/10/2008 10:07",
"instvars" : [
],
"name" : "WAHtmlErrorHandler",
"pools" : [
],
"super" : "WAErrorHandler",
"type" : "normal" }
"category" : "Seaside-Environment",
"classinstvars" : [ ],
"pools" : [ ],
"classvars" : [ ],
"instvars" : [ ],
"name" : "WAHtmlErrorHandler",
"type" : "normal"
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"class" : {
},
"instance" : {
"responseForLibraries" : "pmm 3/16/2013 17:14",
"responseForLibrary:" : "NickAger 3/8/2012 23:45" } }
"responseForLibrary:" : "NickAger 3/8/2012 23:45",
"responseForLibraries" : "pmm 3/16/2013 17:14"
},
"class" : { }
}
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
{
"category" : "Seaside-Environment",
"classinstvars" : [
],
"classvars" : [
],
"commentStamp" : "",
"instvars" : [
],
"name" : "WAHtmlFileHandlerListing",
"pools" : [
],
"super" : "WAFileHandlerListing",
"type" : "normal" }
"category" : "Seaside-Environment",
"classinstvars" : [ ],
"pools" : [ ],
"classvars" : [ ],
"instvars" : [ ],
"name" : "WAHtmlFileHandlerListing",
"type" : "normal"
}
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
{
"class" : {
},
"instance" : {
"forbidden" : "pmm 3/16/2013 17:48",
"notFound" : "pmm 3/16/2013 17:48",
"pageExpired" : "pmm 8/26/2011 16:14",
"refreshAfter:location:message:" : "pmm 8/26/2011 16:14" } }
"notFound" : "pmm 3/16/2013 17:48",
"refreshAfter:location:message:" : "pmm 8/26/2011 16:14"
},
"class" : { }
}
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
{
"category" : "Seaside-Environment",
"classinstvars" : [
],
"classvars" : [
],
"commentStamp" : "lr 2/20/2009 11:16",
"instvars" : [
],
"name" : "WAHtmlResponseGenerator",
"pools" : [
],
"super" : "WAResponseGenerator",
"type" : "normal" }
"category" : "Seaside-Environment",
"classinstvars" : [ ],
"pools" : [ ],
"classvars" : [ ],
"instvars" : [ ],
"name" : "WAHtmlResponseGenerator",
"type" : "normal"
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
{
"class" : {
"description" : "jf 11/24/2009 22:17" },
"instance" : {
"handleFiltered:" : "pmm 9/10/2014 15:55" } }
"handleFiltered:" : "pmm 9/10/2014 15:55"
},
"class" : {
"description" : "jf 11/24/2009 22:17"
}
}
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
{
"category" : "Seaside-Environment",
"classinstvars" : [
],
"classvars" : [
],
"commentStamp" : "pmm 2/18/2011 23:06",
"instvars" : [
],
"name" : "WALegacyRedirectionHandler",
"pools" : [
],
"super" : "WARequestHandler",
"type" : "normal" }
"category" : "Seaside-Environment",
"classinstvars" : [ ],
"pools" : [ ],
"classvars" : [ ],
"instvars" : [ ],
"name" : "WALegacyRedirectionHandler",
"type" : "normal"
}

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions repository/Seaside-Environment.package/properties.json
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
{
}
{ }

0 comments on commit df7afdf

Please sign in to comment.