Skip to content

Commit

Permalink
Merge branch 'dev' into gs_master. Fix Issues #75, #55, #56
Browse files Browse the repository at this point in the history
  • Loading branch information
@dalehenrich
dalehenrich committed Jun 5, 2015
2 parents 6aa3436 + 356860e commit 839c99b
Show file tree
Hide file tree
Showing 20 changed files with 37 additions and 35 deletions.
0 ...ObjectLogDebuggerWalkback.class/README.md → ...StoneContinuationDebugger.class/README.md
View file
File renamed without changes.
0 ...ck.class/instance/exceptionDescription.st → ...er.class/instance/exceptionDescription.st
View file
File renamed without changes.
0 ...s/instance/initializeWithContinuation..st → ...s/instance/initializeWithContinuation..st
View file
File renamed without changes.
0 ...class/instance/renderAnsweringToolsOn..st → ...class/instance/renderAnsweringToolsOn..st
View file
File renamed without changes.
0 ...lkback.class/instance/renderContentOn..st → ...bugger.class/instance/renderContentOn..st
View file
File renamed without changes.
0 ...lkback.class/instance/renderHeadingOn..st → ...bugger.class/instance/renderHeadingOn..st
View file
File renamed without changes.
9 changes: 9 additions & 0 deletions ...e-GemStone-Development.package/WAGemStoneContinuationDebugger.class/methodProperties.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"class" : {
},
"instance" : {
"exceptionDescription" : "dkh 06/05/2015 15:44",
"initializeWithContinuation:" : "dkh 06/05/2015 15:44",
"renderAnsweringToolsOn:" : "dkh 06/05/2015 15:44",
"renderContentOn:" : "dkh 06/05/2015 15:44",
"renderHeadingOn:" : "dkh 06/05/2015 15:44" } }
6 changes: 3 additions & 3 deletions ...LogDebuggerWalkback.class/properties.json → ...ontinuationDebugger.class/properties.json
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"category" : "Seaside-GemStone-Tools-Production-ObjectLog",
"category" : "Seaside-GemStone-Development",
"classinstvars" : [
],
"classvars" : [
],
"commentStamp" : "MarianoMartinezPeck 06/02/2015 22:02",
"commentStamp" : "dkh 06/05/2015 15:44",
"instvars" : [
"errorDescription" ],
"name" : "WAObjectLogDebuggerWalkback",
"name" : "WAGemStoneContinuationDebugger",
"pools" : [
],
"super" : "WAGemStoneWalkback",
Expand Down
4 changes: 2 additions & 2 deletions ...easide-GemStone-Development.package/WARemoteDebuggingWalkback.class/methodProperties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
"addContinuation" : "dkh 07/14/2014 17:02",
"applicationDeployed" : "DaleHenrichs 06/20/2010 12:38",
"initializeWithException:continuation:" : "DaleHenrichs 06/20/2010 12:36",
"logContinuation:" : "MarianoMartinezPeck 06/02/2015 22:57",
"logContinuation:" : "dkh 06/01/2015 09:39",
"renderContentOn:" : "DaleHenrichs 06/20/2010 12:37",
"renderInstructionsOn:" : "dkh 10/07/2011 16:49",
"renderProductionContentOn:" : "DaleHenrichs 06/20/2010 11:03",
"renderToolsOn:" : "DaleHenrichs 06/20/2010 11:03",
"resumeContinuation" : "DaleHenrichs 06/20/2010 11:25",
"stackReportLimit" : "MarianoMartinezPeck 06/02/2015 22:57",
"stackReportLimit" : "dkh 06/02/2015 15:21",
"states" : "DaleHenrichs 06/20/2010 11:03" } }
2 changes: 1 addition & 1 deletion ...one-Development.package/WARemoteDebuggingWalkbackErrorHandler.class/methodProperties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"initialize" : "DaleHenrichs 06/21/2010 11:20" },
"instance" : {
"handleRenderingError:inProduction:" : "DaleHenrichs 06/20/2010 14:50",
"open:" : "MarianoMartinezPeck 06/02/2015 22:55",
"open:" : "dkh 06/01/2015 09:37",
"renderContentForException:on:inProduction:" : "DaleHenrichs 06/20/2010 14:52",
"rendererClass" : "JohanBrichau 02/16/2014 01:17",
"titleForException:" : "DaleHenrichs 06/20/2010 14:43",
Expand Down
1 change: 1 addition & 0 deletions repository/Seaside-GemStone-Development.package/monticello.meta/categories.st
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
SystemOrganization addCategory: #'Seaside-GemStone-Development'!
SystemOrganization addCategory: #'Seaside-GemStone-Development-Core'!
SystemOrganization addCategory: #'Seaside-GemStone-Development-Filter'!
2 changes: 1 addition & 1 deletion repository/Seaside-GemStone-Development.package/monticello.meta/version
View file

Large diffs are not rendered by default.

25 changes: 12 additions & 13 deletions ...easide-GemStone-Tools-Production.package/WAObjectLog.class/instance/debugContinuation..st
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
actions
debugContinuation: aLogEntry
| continuation |
(aLogEntry isKindOf: DebuggerLogEntry) ifTrue: [
continuation := aLogEntry continuation.
continuation ifNotNil: [
((continuation isKindOf: GsProcess) and: [continuation isContinuation]) ifTrue: [
| comp exception |
comp := WAObjectLogDebuggerWalkback new.
comp initializeWithContinuation: continuation.
"exception := (continuation convertToPortableStack _frameContentsAt: 1) at: 11."
self session presenter call: comp.
]
]
]
| continuation |
(aLogEntry isKindOf: DebuggerLogEntry)
ifTrue: [
continuation := aLogEntry continuation.
continuation
ifNotNil: [
((continuation isKindOf: GsProcess) and: [ continuation isContinuation ])
ifTrue: [
| comp exception |
comp := WAGemStoneContinuationDebugger new.
comp initializeWithContinuation: continuation. "exception := (continuation convertToPortableStack _frameContentsAt: 1) at: 11."
self session presenter call: comp ] ] ]
2 changes: 1 addition & 1 deletion repository/Seaside-GemStone-Tools-Production.package/WAObjectLog.class/methodProperties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"initialize" : "DaleHenrichs 07/06/2010 18:32" },
"instance" : {
"children" : "jgf 11/16/2009 13:02",
"debugContinuation:" : "MarianoMartinezPeck 06/02/2015 22:02",
"debugContinuation:" : "dkh 06/05/2015 15:45",
"deleteAllAtPriority:" : "jgf 11/16/2009 13:02",
"deleteLogEntriesUpToInclusive:" : "jgf 11/16/2009 13:02",
"deleteLogEntry:" : "jgf 11/16/2009 13:02",
Expand Down
9 changes: 0 additions & 9 deletions ...GemStone-Tools-Production.package/WAObjectLogDebuggerWalkback.class/methodProperties.json
View file

This file was deleted.

2 changes: 1 addition & 1 deletion repository/Seaside-GemStone-Tools-Production.package/monticello.meta/version
View file

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion repository/Seaside-Gettext-Examples.package/WAGettextExample.class/class/export.st
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
localization
export
WAGetTextExporter new exportTemplate
"WAGetTextExporter not implemented for GemStone and the method exportTemplate does not exist (naturally) ... apprently not used? See https://github.com/GsDevKit/Seaside31/issues/55 & https://github.com/GsDevKit/Seaside31/issues/56"

(Smalltalk at: #'WAGetTextExporter') new perform: #'exportTemplate'
2 changes: 1 addition & 1 deletion repository/Seaside-Gettext-Examples.package/WAGettextExample.class/methodProperties.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"class" : {
"export" : "pmm 5/8/2010 21:05",
"export" : "dkh 06/05/2015 16:20",
"import" : "pmm 5/8/2010 21:49",
"initialize" : "pmm 5/8/2010 16:05",
"register" : "pmm 5/8/2010 22:01",
Expand Down
2 changes: 1 addition & 1 deletion repository/Seaside-Gettext-Examples.package/monticello.meta/version
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
(name 'Seaside-Gettext-Examples-pmm.5' message '- register gettext configuration on application' id 'cddcb136-af4b-4e5b-baea-55b89e1676f4' date '8 May 2010' time '10:16:32 pm' author 'pmm' ancestors ((name 'Seaside-Gettext-Examples-pmm.4' message '- import / export examples' id '1f7852ea-e704-4503-ab14-aee208aa1985' date '8 May 2010' time '9:38:01 pm' author 'pmm' ancestors ((name 'Seaside-Gettext-Examples-pmm.3' message '- start with rendering' id 'd06a1b4b-e034-42be-b0a1-121f7d6ab97e' date '8 May 2010' time '9:00:19 pm' author 'pmm' ancestors ((name 'Seaside-Gettext-Examples-pmm.2' message '- bump session- register app- register domain' id '35da1e15-aa30-4b9c-b4aa-cf56ea7332a6' date '8 May 2010' time '4:16:45 pm' author 'pmm' ancestors ((name 'Seaside-Gettext-Examples-pmm.1' message '- bump' id '7b793471-1b28-4234-87d7-a62aca2dfa2d' date '8 May 2010' time '3:45:57 pm' author 'pmm' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())
(name 'Seaside-Gettext-Examples-dkh.7' message 'Issue #56: #exportTemplate not implemented either' id '3adba75f-862d-451e-ac0d-f3641500fa84' date '06/05/2015' time '16:21:01' author 'dkh' ancestors ((name 'Seaside-Gettext-Examples-dkh.6' message 'Issue #55: WAGetTextExporter not defined and apparently not needed ... remove it from the Undefined Globals universe for now' id 'a92eda8a-37c6-4f19-a121-21d1dcf4c8f8' date '06/05/2015' time '15:31:09' author 'dkh' ancestors ((name 'Seaside-Gettext-Examples-pmm.5' message '- register gettext configuration on application' id 'cddcb136-af4b-4e5b-baea-55b89e1676f4' date '05/08/2010' time '22:16:32' author 'pmm' ancestors ((name 'Seaside-Gettext-Examples-pmm.4' message '- import / export examples' id '1f7852ea-e704-4503-ab14-aee208aa1985' date '05/08/2010' time '21:38:01' author 'pmm' ancestors ((name 'Seaside-Gettext-Examples-pmm.3' message '- start with rendering' id 'd06a1b4b-e034-42be-b0a1-121f7d6ab97e' date '05/08/2010' time '21:00:19' author 'pmm' ancestors ((name 'Seaside-Gettext-Examples-pmm.2' message '- bump session- register app- register domain' id '35da1e15-aa30-4b9c-b4aa-cf56ea7332a6' date '05/08/2010' time '16:16:45' author 'pmm' ancestors ((name 'Seaside-Gettext-Examples-pmm.1' message '- bump' id '7b793471-1b28-4234-87d7-a62aca2dfa2d' date '05/08/2010' time '15:45:57' author 'pmm' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())
Expand Down
2 changes: 1 addition & 1 deletion tests/testTravisCI.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ GsDeployer deploy: [
load: #( ${LOADS} )
].
false ifTrue: [
true ifTrue: [
"Run all tests in image"
TravisCISuiteHarness
value: TestCase suite
Expand Down

0 comments on commit 839c99b

Please sign in to comment.