Skip to content

Commit 839c99b

Browse files
dalehenrichdalehenrich
committed
Merge branch 'dev' into gs_master. Fix Issues #75, #55, #56 
2 parents 6aa3436 + 356860e commit 839c99b

File tree

20 files changed

+37
-35
lines changed

20 files changed

+37
-35
lines changed

‎repository/Seaside-GemStone-Tools-Production.package/WAObjectLogDebuggerWalkback.class/README.md ‎repository/Seaside-GemStone-Development.package/WAGemStoneContinuationDebugger.class/README.md

File renamed without changes.

‎repository/Seaside-GemStone-Tools-Production.package/WAObjectLogDebuggerWalkback.class/instance/exceptionDescription.st ‎repository/Seaside-GemStone-Development.package/WAGemStoneContinuationDebugger.class/instance/exceptionDescription.st

File renamed without changes.

‎repository/Seaside-GemStone-Tools-Production.package/WAObjectLogDebuggerWalkback.class/instance/initializeWithContinuation..st ‎repository/Seaside-GemStone-Development.package/WAGemStoneContinuationDebugger.class/instance/initializeWithContinuation..st

File renamed without changes.

‎repository/Seaside-GemStone-Tools-Production.package/WAObjectLogDebuggerWalkback.class/instance/renderAnsweringToolsOn..st ‎repository/Seaside-GemStone-Development.package/WAGemStoneContinuationDebugger.class/instance/renderAnsweringToolsOn..st

File renamed without changes.

‎repository/Seaside-GemStone-Tools-Production.package/WAObjectLogDebuggerWalkback.class/instance/renderContentOn..st ‎repository/Seaside-GemStone-Development.package/WAGemStoneContinuationDebugger.class/instance/renderContentOn..st

File renamed without changes.

‎repository/Seaside-GemStone-Tools-Production.package/WAObjectLogDebuggerWalkback.class/instance/renderHeadingOn..st ‎repository/Seaside-GemStone-Development.package/WAGemStoneContinuationDebugger.class/instance/renderHeadingOn..st

File renamed without changes.

‎repository/Seaside-GemStone-Development.package/WAGemStoneContinuationDebugger.class/methodProperties.json

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"class" : {
3+
},
4+
"instance" : {
5+
"exceptionDescription" : "dkh 06/05/2015 15:44",
6+
"initializeWithContinuation:" : "dkh 06/05/2015 15:44",
7+
"renderAnsweringToolsOn:" : "dkh 06/05/2015 15:44",
8+
"renderContentOn:" : "dkh 06/05/2015 15:44",
9+
"renderHeadingOn:" : "dkh 06/05/2015 15:44" } }

‎repository/Seaside-GemStone-Tools-Production.package/WAObjectLogDebuggerWalkback.class/properties.json ‎repository/Seaside-GemStone-Development.package/WAGemStoneContinuationDebugger.class/properties.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
2-
"category" : "Seaside-GemStone-Tools-Production-ObjectLog",
2+
"category" : "Seaside-GemStone-Development",
33
"classinstvars" : [
44
],
55
"classvars" : [
66
],
7-
"commentStamp" : "MarianoMartinezPeck 06/02/2015 22:02",
7+
"commentStamp" : "dkh 06/05/2015 15:44",
88
"instvars" : [
99
"errorDescription" ],
10-
"name" : "WAObjectLogDebuggerWalkback",
10+
"name" : "WAGemStoneContinuationDebugger",
1111
"pools" : [
1212
],
1313
"super" : "WAGemStoneWalkback",

‎repository/Seaside-GemStone-Development.package/WARemoteDebuggingWalkback.class/methodProperties.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
"addContinuation" : "dkh 07/14/2014 17:02",
66
"applicationDeployed" : "DaleHenrichs 06/20/2010 12:38",
77
"initializeWithException:continuation:" : "DaleHenrichs 06/20/2010 12:36",
8-
"logContinuation:" : "MarianoMartinezPeck 06/02/2015 22:57",
8+
"logContinuation:" : "dkh 06/01/2015 09:39",
99
"renderContentOn:" : "DaleHenrichs 06/20/2010 12:37",
1010
"renderInstructionsOn:" : "dkh 10/07/2011 16:49",
1111
"renderProductionContentOn:" : "DaleHenrichs 06/20/2010 11:03",
1212
"renderToolsOn:" : "DaleHenrichs 06/20/2010 11:03",
1313
"resumeContinuation" : "DaleHenrichs 06/20/2010 11:25",
14-
"stackReportLimit" : "MarianoMartinezPeck 06/02/2015 22:57",
14+
"stackReportLimit" : "dkh 06/02/2015 15:21",
1515
"states" : "DaleHenrichs 06/20/2010 11:03" } }

‎repository/Seaside-GemStone-Development.package/WARemoteDebuggingWalkbackErrorHandler.class/methodProperties.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"initialize" : "DaleHenrichs 06/21/2010 11:20" },
44
"instance" : {
55
"handleRenderingError:inProduction:" : "DaleHenrichs 06/20/2010 14:50",
6-
"open:" : "MarianoMartinezPeck 06/02/2015 22:55",
6+
"open:" : "dkh 06/01/2015 09:37",
77
"renderContentForException:on:inProduction:" : "DaleHenrichs 06/20/2010 14:52",
88
"rendererClass" : "JohanBrichau 02/16/2014 01:17",
99
"titleForException:" : "DaleHenrichs 06/20/2010 14:43",

‎repository/Seaside-GemStone-Development.package/monticello.meta/categories.st

+1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1+
SystemOrganization addCategory: #'Seaside-GemStone-Development'!
12
SystemOrganization addCategory: #'Seaside-GemStone-Development-Core'!
23
SystemOrganization addCategory: #'Seaside-GemStone-Development-Filter'!

‎repository/Seaside-GemStone-Development.package/monticello.meta/version

+1-1
Large diffs are not rendered by default.

‎repository/Seaside-GemStone-Tools-Production.package/WAObjectLog.class/instance/debugContinuation..st

+12-13
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
actions
22
debugContinuation: aLogEntry
3-
| continuation |
4-
(aLogEntry isKindOf: DebuggerLogEntry) ifTrue: [
5-
continuation := aLogEntry continuation.
6-
continuation ifNotNil: [
7-
((continuation isKindOf: GsProcess) and: [continuation isContinuation]) ifTrue: [
8-
| comp exception |
9-
comp := WAObjectLogDebuggerWalkback new.
10-
comp initializeWithContinuation: continuation.
11-
"exception := (continuation convertToPortableStack _frameContentsAt: 1) at: 11."
12-
self session presenter call: comp.
13-
]
14-
]
15-
]
3+
| continuation |
4+
(aLogEntry isKindOf: DebuggerLogEntry)
5+
ifTrue: [
6+
continuation := aLogEntry continuation.
7+
continuation
8+
ifNotNil: [
9+
((continuation isKindOf: GsProcess) and: [ continuation isContinuation ])
10+
ifTrue: [
11+
| comp exception |
12+
comp := WAGemStoneContinuationDebugger new.
13+
comp initializeWithContinuation: continuation. "exception := (continuation convertToPortableStack _frameContentsAt: 1) at: 11."
14+
self session presenter call: comp ] ] ]

‎repository/Seaside-GemStone-Tools-Production.package/WAObjectLog.class/methodProperties.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"initialize" : "DaleHenrichs 07/06/2010 18:32" },
77
"instance" : {
88
"children" : "jgf 11/16/2009 13:02",
9-
"debugContinuation:" : "MarianoMartinezPeck 06/02/2015 22:02",
9+
"debugContinuation:" : "dkh 06/05/2015 15:45",
1010
"deleteAllAtPriority:" : "jgf 11/16/2009 13:02",
1111
"deleteLogEntriesUpToInclusive:" : "jgf 11/16/2009 13:02",
1212
"deleteLogEntry:" : "jgf 11/16/2009 13:02",

‎repository/Seaside-GemStone-Tools-Production.package/WAObjectLogDebuggerWalkback.class/methodProperties.json

-9
This file was deleted.

‎repository/Seaside-GemStone-Tools-Production.package/monticello.meta/version

+1-1
Large diffs are not rendered by default.

‎repository/Seaside-Gettext-Examples.package/WAGettextExample.class/class/export.st

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
localization
22
export
3-
WAGetTextExporter new exportTemplate
3+
"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"
4+
5+
(Smalltalk at: #'WAGetTextExporter') new perform: #'exportTemplate'

‎repository/Seaside-Gettext-Examples.package/WAGettextExample.class/methodProperties.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"class" : {
3-
"export" : "pmm 5/8/2010 21:05",
3+
"export" : "dkh 06/05/2015 16:20",
44
"import" : "pmm 5/8/2010 21:49",
55
"initialize" : "pmm 5/8/2010 16:05",
66
"register" : "pmm 5/8/2010 22:01",

‎repository/Seaside-Gettext-Examples.package/monticello.meta/version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +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 ())
1+
(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 ())

‎tests/testTravisCI.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ GsDeployer deploy: [
5454
load: #( ${LOADS} )
5555
].
5656
57-
false ifTrue: [
57+
true ifTrue: [
5858
"Run all tests in image"
5959
TravisCISuiteHarness
6060
value: TestCase suite

0 commit comments

Comments
 (0)