Mercurial Mercurial > hg > stx-libjava / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixes for hudson jk_new_structure
authorvranyj1
Wed, 01 Jun 2011 10:10:48 +0000
branchjk_new_structure
changeset 829 429f6dddb0a9
parent 828 eecd61aef161
child 830 235c482b462f
Fixes for hudson
src/JavaInitializedResource.st file | annotate | diff | comparison | revisions
src/JavaTestsLoader.st file | annotate | diff | comparison | revisions 
--- a/src/JavaInitializedResource.st	Tue May 31 22:15:28 2011 +0000
+++ b/src/JavaInitializedResource.st	Wed Jun 01 10:10:48 2011 +0000
@@ -14,17 +14,11 @@
 
     | java_lang_System |
 
-    Smalltalk isStandAloneApp ifTrue:[
-        Java flushAllJavaResources.
+	(java_lang_System := Java at: 'java.lang.System') ifNil:[
         Java initialize.
         JavaVM initializeVM.
-    ] ifFalse:[
-        (java_lang_System := Java at: 'java.lang.System') ifNil:[
-            Java initialize.
-            JavaVM initializeVM.
-        ] ifNotNil:[
-            java_lang_System classInit.
-        ]
+    ] ifNotNil:[
+		java_lang_System classInit.       
     ]
 
     "Created: / 16-03-2011 / 14:42:21 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -32,9 +26,11 @@
 
 tearDown
 
+	"
     Smalltalk isStandAloneApp ifTrue:[
         Java flushAllJavaResources.
     ]
+	"
 
     "Created: / 16-03-2011 / 14:42:35 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
--- a/src/JavaTestsLoader.st	Tue May 31 22:15:28 2011 +0000
+++ b/src/JavaTestsLoader.st	Wed Jun 01 10:10:48 2011 +0000
@@ -39,6 +39,7 @@
 
 loadIn: directories
 
+    JavaInitializedResource new setUp.	
     JavaLibrariesResource new setUp.
     JavaTestsResource new setUp.
hg/stx-libjava