Skip to content

release v3.1.3.2-gs #57

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 47 commits into from
Jan 23, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
599d08a
adapted baseline to include Filesystem package from github repo
Oct 8, 2014
f48dccf
Merge pull request #50 from GsDevKit/master-issue48
Oct 8, 2014
f1a6a32
Issue #51: first cut at fixing the gettext load problem (might be oth…
dalehenrich Oct 9, 2014
693dacc
Issue #51: incorporate changes from Issue #50, to get the FileSystem …
dalehenrich Oct 9, 2014
d92cfe0
Merge branch 'gs_master' into dev3.1.3.1
dalehenrich Dec 10, 2014
b200429
Issue #54: implement GemServer class for Swazoo, FastCGI and Zinc Sea…
dalehenrich Dec 11, 2014
5fa1a7a
Issue #54: add some live http gem server tests ... get a simple page …
dalehenrich Dec 11, 2014
53cff75
Issue #54: add our own test components ... one with 200 and one with …
dalehenrich Dec 11, 2014
f36916d
add Swazoo to lineup and run all tests in image
dalehenrich Dec 11, 2014
0bf530c
disable full tests until Issue #55 and #56 addressed
dalehenrich Dec 11, 2014
134c7f7
Issue #54: expand the tests for WAGemStoneWalkbackErrorHandler to cov…
dalehenrich Dec 11, 2014
8824509
Issue #54: straighten out tests
dalehenrich Dec 11, 2014
85f2c6b
Issue #54: implement MaintenanceVmGemServer and arrange for Maintenan…
dalehenrich Dec 12, 2014
c412915
Issue #54: fix a minor bug ...
dalehenrich Dec 12, 2014
b4db6d6
[ci skip] update readme
dalehenrich Dec 13, 2014
3b2621f
[ci skip] update readme
dalehenrich Dec 13, 2014
6d9fa74
[ci skip] update readme
dalehenrich Dec 13, 2014
6089af5
Issue #54: add logging to FastCGISeasideGemServer
dalehenrich Dec 13, 2014
ce27e24
Merge branch 'issue_54' of github.com:GsDevKit/Seaside31 into issue_54
dalehenrich Dec 13, 2014
a87bbdf
Issue #54: introduce WAGemStoneAbstractTaskGemServer as support for S…
dalehenrich Dec 13, 2014
70062b6
Issue #54: split Seaside-GemStone-GemServer into two packages: Seasid…
dalehenrich Dec 14, 2014
fbc2464
Issue #54: Seaside-GemStone-GemServer-Tests are dependenct upon Zinc …
dalehenrich Dec 14, 2014
60747c8
Issue #54: fiddle with dependencies surrounding Seaside-GemStone-GemS…
dalehenrich Dec 14, 2014
75c4fe2
Issue #54: final dependency tweak methinks
dalehenrich Dec 14, 2014
9214af7
WAScriptGenerator>>writeLoadScriptsOn: in Seaside-Core sends the mess…
dalehenrich Dec 14, 2014
f1229f5
GRGemStonePlatform>>seasideProcessRequest:adaptor:resultBlock: in Sea…
dalehenrich Dec 14, 2014
93a1f1b
Issue #54: refine implementation of WAGemStoneAbstractTaskGemServer a…
dalehenrich Dec 14, 2014
7b8694b
Issue #54: implement statusGems so that maintenance vm status is incl…
dalehenrich Dec 14, 2014
39d7234
Issue #54: clean up statusGems implementation for seaside gem servers
dalehenrich Dec 15, 2014
e298fe8
Issue #59: add error stack logging to try to characterize random test…
dalehenrich Dec 15, 2014
be42cc0
Issue #59: more logging ...
dalehenrich Dec 16, 2014
2ccc502
add gitter web hook for travis
dalehenrich Dec 16, 2014
f5d31e5
Issue #54: add helpful comment in WAGemStoneAbstractTaskGemServer>>st…
dalehenrich Dec 16, 2014
7186c94
add gitter public chat room
dalehenrich Dec 16, 2014
4908e6e
Issue #54: rename breakpointExceptionSet to gemServerExceptionSet
dalehenrich Dec 20, 2014
1e36ced
remove gitter private chat room
dalehenrich Dec 20, 2014
045a2e4
Issue #54: make minimal changes to be compatible with GsApplicationTo…
dalehenrich Jan 6, 2015
babfb44
Issue #54: use dev branch for GsApplicationTools
dalehenrich Jan 6, 2015
8f9b8bb
Issue #54: replacing use of ports with portOrResourceNameList in GemS…
dalehenrich Jan 6, 2015
c6ac8cb
added GemServer>>ports and GemServer>>ports: so ports not needed locally
dalehenrich Jan 7, 2015
65d5634
Issue #54: change GsApplicationTools project reference back to: gsApp…
dalehenrich Jan 8, 2015
bd748fc
Merge branch 'master' into issue_54
dalehenrich Jan 15, 2015
308df69
Issue #54: reference GsApplicationTools:issue_19 to validate tests wi…
dalehenrich Jan 15, 2015
e231e8c
Issue #54: focus on interactive debugging, since Seaside already has …
dalehenrich Jan 16, 2015
5062b14
Issue #54: initial cut at getting ZnSeasideNewGemServerTests set up f…
dalehenrich Jan 16, 2015
5a01179
Issue #54: put delays back in for SeasideGemServerTests>>testStartRes…
dalehenrich Jan 17, 2015
04da5c0
Issue #54: change zinc project to reference zinc:v2.4.3.?
dalehenrich Jan 23, 2015
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,18 @@
language: erlang

notifications:
webhooks:
urls:
- https://webhooks.gitter.im/e/c59e6bffa0b41a693676 # GsDevKit/chat (public)
on_success: always # options: [always|never|change] default: always
on_failure: always # options: [always|never|change] default: always
on_start: false # default: false

env:

# standard load
- ST=GemStone-3.1.0.6 BASELINE=Seaside3 LOADS="'CI' 'Zinc' 'FastCGI'" REPOSITORY="filetree://${TRAVIS_BUILD_DIR}/repository"
- ST=GemStone-3.2.2 BASELINE=Seaside3 LOADS="'CI' 'Zinc' 'FastCGI'" REPOSITORY="filetree://${TRAVIS_BUILD_DIR}/repository"
- ST=GemStone-3.1.0.6 BASELINE=Seaside3 LOADS="'CI' 'Swazoo' 'Zinc' 'FastCGI'" REPOSITORY="filetree://${TRAVIS_BUILD_DIR}/repository"
- ST=GemStone-3.2.2 BASELINE=Seaside3 LOADS="'CI' 'Swazoo' 'Zinc' 'FastCGI'" REPOSITORY="filetree://${TRAVIS_BUILD_DIR}/repository"
# whole enchilada
- ST=GemStone-3.2.2 BASELINE=Seaside3 LOADS="'ALL'" REPOSITORY="filetree://${TRAVIS_BUILD_DIR}/repository"
install:
Expand Down
30 changes: 30 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,36 @@ See more at http://www.seaside.st/
load: #('Development' 'Examples' 'Zinc') ].
```

## Managing Seaside Gem Servers

```Smalltalk
"Register gem servers"
FastCGISeasideGemServer register: 'FastCGISeasideGems' on: #( 9001 9002 9003 )
enableLogToObjectLog;
yourself.

ZnSeasideGemServer register: 'ZincSeasideGems' on: #( 8383 )
logToObjectLog;
logErrorsOnly;
yourself.

"Start gem servers - including maintenance vm"
(GemServerRegistry gemServerNamed: 'FastCGISeasideGems') startGems.
(GemServerRegistry gemServerNamed: 'ZincSeasideGems') startGems.

"Restart gem servers"
(GemServerRegistry gemServerNamed: 'FastCGISeasideGems') restartGems.
(GemServerRegistry gemServerNamed: 'ZincSeasideGems') restartGems.

"Stop gem servers"
(GemServerRegistry gemServerNamed: 'FastCGISeasideGems') stopGems.
(GemServerRegistry gemServerNamed: 'ZincSeasideGems') stopGems.

"Unregister gem servers"
(GemServerRegistry gemServerNamed: 'FastCGISeasideGems') unregister.
(GemServerRegistry gemServerNamed: 'ZincSeasideGems') unregister.
```

## Build Status
- [![gs_master branch:](https://travis-ci.org/GsDevKit/Seaside31.png?branch=gs_master)](https://travis-ci.org/GsDevKit/Seaside31) gs_master (Gemstone)
- [![master branch (pharo/squeak):](https://travis-ci.org/GsDevKit/Seaside31.png?branch=master)](https://travis-ci.org/GsDevKit/Seaside31) master (Pharo/Squeak)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,16 @@ baselineadaptors: spec
className: 'ConfigurationOfSwazoo2';
loads: #('Swazoo');
repository: 'http://smalltalkhub.com/mc/Swazoo/Swazoo/main' ].
spec
project: 'Zinc Project'
with: [
spec
versionString: #'stable';
className: 'ConfigurationOfZincHTTPComponents';
repository: 'http://mc.stfx.eu/ZincHTTPComponents' ].
spec
package: 'Zinc-Seaside'
with: [ spec requires: #('Zinc Project' 'Seaside-Core') ].
spec
package: 'Seaside-Swazoo'
with: [ spec requires: #('Grease' 'Swazoo2');
with: [
spec
requires: #('Grease' 'Swazoo2');
repository:
'http://smalltalkhub.com/mc/Seaside/Seaside30LGPL/main' ];
'http://smalltalkhub.com/mc/Seaside/Seaside30LGPL/main' ];
package: 'Seaside-Adaptors-Swazoo'
with: [ spec requires: #('Seaside-Core' 'Seaside-Swazoo') ].
spec
Expand All @@ -36,6 +31,13 @@ baselineadaptors: spec
for: #'squeakCommon'
do: [
spec repository: 'http://smalltalkhub.com/mc/Seaside/Seaside31/main'.
spec
project: 'Zinc Project'
with: [
spec
versionString: #'stable';
className: 'ConfigurationOfZincHTTPComponents';
repository: 'http://mc.stfx.eu/ZincHTTPComponents' ].
spec
project: 'WebClient Project'
with: [
Expand Down Expand Up @@ -81,21 +83,47 @@ baselineadaptors: spec
do: [
spec
project: 'FastCGI Project'
with: [
spec
className: 'ConfigurationOfGsFastCGI';
versionString: #'stable';
loads: #('FastCGI');
repository: 'http://seaside.gemtalksystems.com/ss/MetacelloRepository' ].
with: [
spec
className: 'ConfigurationOfGsFastCGI';
versionString: #'stable';
loads: #('FastCGI');
repository:
'http://seaside.gemtalksystems.com/ss/MetacelloRepository' ];
baseline: 'GsApplicationTools'
with: [
spec
loads: 'Core';
repository:
'github://GsDevKit/gsApplicationTools:issue_19/repository' ];
baseline: 'Zinc Project'
with: [
spec
className: 'BaselineOfZincHTTPComponents';
repository: 'github://GsDevKit/zinc:v2.4.3.?/repository' ];
yourself.
spec
package: 'Seaside-GemStone-GemServer-Core'
with: [ spec requires: #('GsApplicationTools' 'Seaside-Core') ];
package: 'Seaside-GemStone-GemServer-Tests'
with: [
spec
requires:
#('Seaside-GemStone-GemServer-Core' 'Seaside-GemStone-Development' 'Seaside-GemStone-Adaptors-Swazoo' 'Seaside-GemStone-Adaptors-Zinc' 'Seaside-Adaptors-FastCGI') ];
package: 'Seaside-Adaptors-Swazoo'
with: [ spec includes: #('Seaside-GemStone-Adaptors-Swazoo') ];
package: 'Zinc-Seaside'
with: [ spec includes: #('Seaside-GemStone-Adaptors-Zinc') ];
package: 'Seaside-Adaptors-FastCGI'
with: [ spec requires: #('Seaside-Core' 'FastCGI Project') ];
with: [
spec
requires:
#('Seaside-Core' 'FastCGI Project' 'Seaside-GemStone-GemServer-Core') ];
package: 'Seaside-GemStone-Adaptors-Swazoo'
with: [ spec requires: #('Seaside-Adaptors-Swazoo') ];
with: [ spec requires: #('Seaside-Adaptors-Swazoo' 'Seaside-GemStone-GemServer-Core') ];
package: 'Seaside-GemStone-Adaptors-Zinc'
with: [ spec requires: #('Zinc-Seaside') ].
spec group: 'FastCGI' with: #('Seaside-Adaptors-FastCGI') ]
with: [ spec requires: #('Zinc-Seaside' 'Seaside-GemStone-GemServer-Core') ].
spec
group: 'FastCGI' with: #('Seaside-Adaptors-FastCGI');
group: 'Tests' with: #('Seaside-GemStone-GemServer-Tests');
yourself ]
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
baselines
baselinecommon: spec

spec
for: #'squeakCommon'
do: [
Expand All @@ -19,20 +18,18 @@ baselinecommon: spec
].

spec
for: #gemstone
do: [
spec
baseline: 'Grease'
with: [
spec
loads: #('Grease-Core');
repository: 'github://GsDevKit/Grease:master/repository' ].
spec
project: 'Grease Core Tests'
copyFrom: 'Grease'
with: [ spec loads: #('Core Tests') ]
].

for: #'gemstone'
do: [
spec
baseline: 'Grease'
with: [
spec
loads: #('Grease-Core');
repository: 'github://GsDevKit/Grease:master/repository' ].
spec
project: 'Grease Core Tests'
copyFrom: 'Grease'
with: [ spec loads: #('Core Tests') ] ].
spec
for: #'common'
do: [
Expand Down
Original file line number Diff line number Diff line change
@@ -1,37 +1,37 @@
baselines
baselinegettext: spec

spec for: #'common' do: [
spec
project: 'Gettext-Project'
with: [ spec
className: 'ConfigurationOfGettext';
versionString: #'stable';
repository: 'http://www.smalltalkhub.com/mc/PharoExtras/Gettext/main' ].
spec
package: 'Seaside-Gettext-Core' with: [ spec requires: #('Gettext-Project' 'Seaside-Core') ];
package: 'Seaside-Gettext-Examples' with: [ spec requires: #('Seaside-Gettext-Core') ].
spec
group: 'CI' with: #('Seaside-Gettext-Examples');
group: 'Gettext' with: #('Seaside-Gettext-Core');
group: 'Gettext-Examples' with: #('Gettext' 'Seaside-Gettext-Examples')
].

spec for: #'squeakCommon' do: [
spec repository: 'http://www.smalltalkhub.com/mc/Seaside/Seaside30Addons/main' ].
spec for: #(#squeak 'pharo1.x') do:[
spec
package: 'Seaside-Gettext-Slime' with: [ spec requires: #('Slime') ].
spec
group: 'GettextSlime' with: #('Seaside-Gettext-Slime')
].

spec for: #pharo do: [
spec
package: 'Seaside-Pharo-Gettext-Core';
package: 'Seaside-Gettext-Core' with:[spec includes: 'Seaside-Pharo-Gettext-Core'].
].
spec
for: #'common'
do: [
spec
project: 'Gettext-Project'
with: [
spec
className: 'ConfigurationOfGettext';
versionString: #'stable';
repository:
'http://www.smalltalkhub.com/mc/PharoExtras/Gettext/main' ].
spec
package: 'Seaside-Gettext-Core'
with: [ spec requires: #('Gettext-Project' 'Core') ];
package: 'Seaside-Gettext-Examples'
with: [ spec requires: #('Seaside-Gettext-Core') ].
spec
group: 'CI' with: #('Seaside-Gettext-Examples');
group: 'Gettext' with: #('Seaside-Gettext-Core');
group: 'Gettext-Examples' with: #('Gettext' 'Seaside-Gettext-Examples') ].
spec
for: #'squeakCommon'
do: [ spec repository: 'http://www.smalltalkhub.com/mc/Seaside/Seaside30Addons/main' ].
spec
for: #(#'squeak' 'pharo1.x')
do: [
spec package: 'Seaside-Gettext-Slime' with: [ spec requires: #('Slime') ].
spec group: 'GettextSlime' with: #('Seaside-Gettext-Slime') ].
spec
for: #'pharo'
do: [
spec
package: 'Seaside-Pharo-Gettext-Core';
package: 'Seaside-Gettext-Core'
with: [ spec includes: 'Seaside-Pharo-Gettext-Core' ] ]
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
},
"instance" : {
"baseline:" : "JohanBrichau 2/15/2014 11:45",
"baselineadaptors:" : "PaulDeBruicker 11/4/2014 14:01",
"baselineadaptors:" : "dkh 01/22/2015 16:13",
"baselinecomet:" : "JohanBrichau 2/15/2014 11:48",
"baselinecommon:" : "dkh 10/07/2014 16:41",
"baselinefilesystem:" : "JohanBrichau 10/8/2014 20:18",
"baselinecommon:" : "dkh 10/09/2014 11:38",
"baselinefilesystem:" : "dkh 10/09/2014 11:55",
"baselinegemstone:" : "JohanBrichau 09/20/2014 11:59",
"baselinegettext:" : "dkh 10/07/2014 17:42",
"baselinegettext:" : "dkh 12/14/2014 12:18",
"baselinejavascript:" : "dkh 07/02/2014 15:20",
"baselinejquery:" : "JohanBrichau 2/15/2014 11:47",
"baselinejqueryui:" : "JohanBrichau 2/15/2014 11:47",
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
SystemOrganization addCategory: #BaselineOfSeaside3!
SystemOrganization addCategory: #'BaselineOfSeaside3'!

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
accessing
defaultPortList
^ #(9001 9002 9003)
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
accessing
serverClass
^ WAFastCGIAdaptor
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
logging
disableLogToObjectLog
"Setup logging to the Object Log"

FSLog disableLog
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
logging
enableLogToObjectLog
"Setup logging to the Object Log"

FSLog enableLog
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"class" : {
"defaultPortList" : "dkh 12/10/2014 14:35",
"serverClass" : "dkh 12/10/2014 14:31" },
"instance" : {
"disableLogToObjectLog" : "dkh 12/13/2014 12:52",
"enableLogToObjectLog" : "dkh 12/13/2014 12:52" } }
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"category" : "Seaside-Adaptors-FastCGI",
"classinstvars" : [
],
"classvars" : [
],
"commentStamp" : "",
"instvars" : [
],
"name" : "FastCGISeasideGemServer",
"pools" : [
],
"super" : "SeasideGemServer",
"type" : "normal" }
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
starting/stopping
gemServerStart
"start without blocking"

[ self basicStart ] fork
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"basicStop" : "dkh 09/30/2009 12:06",
"createServer" : "dkh 09/30/2009 11:03",
"defaultCodec" : "dkh 11/06/2009 08:46",
"gemServerStart" : "dkh 12/10/2014 16:16",
"internalServerErrorMessage:" : "DaleHenrichs 06/18/2010 16:50",
"internalServerMalfunction:" : "DaleHenrichs 06/18/2010 16:47",
"isRunning" : "dkh 09/30/2009 11:02",
Expand Down
Loading