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.
Merged branch development refactoring-classpath development
authorJan Vrany <jan.vrany@fit.cvut.cz>
Thu, 24 Jan 2013 15:49:03 +0000
branchdevelopment
changeset 1997 8bcca8a0e8a1
parent 1996 0edecf17c815 (current diff)
parent 1995 b129fd0a81e4 (diff)
child 1999 3523d3da8d7a
Merged branch development refactoring-classpath
JavaRootBundle.st file | annotate | diff | comparison | revisions
java/extensions/java/lang/Short.st file | annotate | diff | comparison | revisions
java/extensions/java/lang/String.st file | annotate | diff | comparison | revisions
java/extensions/java/lang/Throwable.st file | annotate | diff | comparison | revisions
libjava.rc file | annotate | diff | comparison | revisions
stx_libjava.st file | annotate | diff | comparison | revisions 
--- a/Java.st	Thu Jan 24 15:35:33 2013 +0000
+++ b/Java.st	Thu Jan 24 15:49:03 2013 +0000
@@ -22,12 +22,12 @@
 
 Object subclass:#Java
 	instanceVariableNames:''
-	classVariableNames:'Classes UnresolvedClassRefs Release RootBundle ClassPath
-		SourcePath ClassPathExt ExtensionsPath ExtensionsPathPackages
-		CacheDirectory JavaHome InternedStrings Java_lang_String
-		Java_lang_Class PrettyPrintStyle LastArgumentString Threads
-		ExcludedClassPath FailedToLoadClasses SourceCache
-		SourceArchiveCache JavaClassLoaderQuerySignal
+	classVariableNames:'Classes UnresolvedClassRefs Release BootBundle ClassPath
+		ClassPathBundle SourcePath ClassPathExt ExtensionsPath
+		ExtensionsPathPackages CacheDirectory JavaHome InternedStrings
+		Java_lang_String Java_lang_Class PrettyPrintStyle
+		LastArgumentString Threads ExcludedClassPath FailedToLoadClasses
+		SourceCache SourceArchiveCache JavaClassLoaderQuerySignal
 		ClassLoaderQuerySignal ThreadsAccess'
 	poolDictionaries:''
 	category:'Languages-Java-Support'
@@ -122,11 +122,13 @@
 javaExtDirs
 
     ^Java release javaExtDirs
-"/        ,{
-"/            ((Smalltalk packageDirectoryForPackageId: 'stx:libjava') asFilename
-"/                / 'java' / 'libs') }.
+        , (Array 
+                with: ((Smalltalk packageDirectoryForPackageId: 'stx:libjava') / 'java' / 'bin')
+                with: ((Smalltalk packageDirectoryForPackageId: 'stx:libjava') / 'java' / 'libs') 
+        ).
 
     "Created: / 31-08-2011 / 22:55:38 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 23-01-2013 / 15:26:14 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 java_lang_Class
@@ -264,7 +266,7 @@
 
     Threads := IdentityDictionary new.
 
-    RootBundle := JavaRootBundle new.
+    ClassPathBundle := JavaClassPathBundle new.
     ClassPath := OrderedCollection new. "/ for ad-hoc packages
     SourcePath := OrderedCollection new."/ for ad-hoc packages
 
@@ -283,7 +285,7 @@
     "Created: / 03-10-2010 / 15:54:02 / Jan Kurs <kurs.jan@post.cz>"
     "Modified: / 15-10-2010 / 17:37:20 / Jan Kurs <kurs.jan@post.cz>"
     "Modified: / 09-12-2011 / 13:16:15 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
-    "Modified: / 16-01-2013 / 12:44:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 23-01-2013 / 14:44:52 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 initializePrettyPrintStyle
@@ -769,7 +771,7 @@
 !
 
 effectiveClassPath
-    ^RootBundle classPath , self classPath
+    ^ClassPathBundle classPath , self classPath
 
     "
     Java effectiveClassPath
@@ -777,7 +779,7 @@
 
     "Created: / 22-11-2010 / 13:03:54 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified: / 17-01-2011 / 09:44:16 / kursjan <kursjan@fit.cvut.cz>"
-    "Modified: / 16-01-2013 / 12:45:29 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 23-01-2013 / 14:45:11 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 effectiveExtensionsPath
@@ -796,13 +798,13 @@
 !
 
 effectiveSourceDirectories
-    ^RootBundle sourcePath , SourcePath
+    ^Release sourcePath , ClassPathBundle sourcePath , SourcePath
     "
-	Java effectiveSourceDirectories
+        Java effectiveSourceDirectories
     "
 
     "Created: / 30-11-2010 / 11:53:42 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 16-01-2013 / 12:46:40 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 23-01-2013 / 15:22:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 excludedClassPath
@@ -1605,4 +1607,5 @@
 
 ! !
 
+
 Java initialize!
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/JavaClassPathBundle.st	Thu Jan 24 15:49:03 2013 +0000
@@ -0,0 +1,256 @@
+"
+ COPYRIGHT (c) 1996-2011 by Claus Gittinger
+
+ New code and modifications done at SWING Research Group [1]:
+
+ COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
+                            SWING Research Group, Czech Technical University in Prague
+
+ This software is furnished under a license and may be used
+ only in accordance with the terms of that license and with the
+ inclusion of the above copyright notice.   This software may not
+ be provided or otherwise made available to, or used by, any
+ other person.  No title to or ownership of the software is
+ hereby transferred.
+
+ [1] Code written at SWING Research Group contains a signature
+     of one of the above copright owners. For exact set of such code,
+     see the differences between this version and version stx:libjava
+     as of 1.9.2010
+"
+"{ Package: 'stx:libjava' }"
+
+JavaCodeBundle subclass:#JavaClassPathBundle
+	instanceVariableNames:'environment packages user'
+	classVariableNames:''
+	poolDictionaries:''
+	category:'Languages-Java-Support-Libraries'
+!
+
+JavaCodeBundle subclass:#EnvironmentBundle
+	instanceVariableNames:''
+	classVariableNames:''
+	poolDictionaries:''
+	privateIn:JavaClassPathBundle
+!
+
+JavaCodeBundle subclass:#PackagesBundle
+	instanceVariableNames:''
+	classVariableNames:''
+	poolDictionaries:''
+	privateIn:JavaClassPathBundle
+!
+
+!JavaClassPathBundle class methodsFor:'documentation'!
+
+copyright
+"
+ COPYRIGHT (c) 1996-2011 by Claus Gittinger
+
+ New code and modifications done at SWING Research Group [1]:
+
+ COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
+                            SWING Research Group, Czech Technical University in Prague
+
+ This software is furnished under a license and may be used
+ only in accordance with the terms of that license and with the
+ inclusion of the above copyright notice.   This software may not
+ be provided or otherwise made available to, or used by, any
+ other person.  No title to or ownership of the software is
+ hereby transferred.
+
+ [1] Code written at SWING Research Group contains a signature
+     of one of the above copright owners. For exact set of such code,
+     see the differences between this version and version stx:libjava
+     as of 1.9.2010
+
+"
+!
+
+documentation
+"
+    A top-level bundle representing code passed to a Java thought
+    classpath. In other words, it represents all code loadable by
+    system class loader.
+
+    [author:]
+        Jan Vrany <jan.vrany@fit.cvut.cz>
+
+    [instance variables:]
+
+    [class variables:]
+
+    [see also:]
+        java.lang.ClassLoader.getSystemClassLoader()
+        sun,misc.Launcher
+
+"
+! !
+
+!JavaClassPathBundle methodsFor:'accessing'!
+
+libraries
+    {
+        environment.
+        packages.
+        user.
+    }
+
+    "Created: / 15-01-2013 / 17:50:30 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 23-01-2013 / 14:42:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+name
+    ^ name ? '<root>'
+
+    "Created: / 15-01-2013 / 17:50:40 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
+!JavaClassPathBundle methodsFor:'adding & removing'!
+
+add: libraryOrBundle
+
+    self shouldNotImplement
+
+    "Created: / 15-01-2013 / 17:31:43 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+remove: libraryOrBundle
+
+    self shouldNotImplement
+
+    "Created: / 15-01-2013 / 17:31:52 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
+!JavaClassPathBundle methodsFor:'generating'!
+
+classPathOn:aStream
+    "superclass JavaCodeLibraryOrBundle says that I am responsible to implement this method"
+
+    environment classPathOn: aStream.
+    packages classPathOn: aStream.
+    user classPathOn: aStream.
+
+    "Created: / 15-01-2013 / 17:51:19 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 23-01-2013 / 14:42:19 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+sourcePathOn:aStream
+    "superclass JavaCodeLibraryOrBundle says that I am responsible to implement this method"
+
+    environment sourcePathOn: aStream.
+    packages sourcePathOn: aStream.
+    user sourcePathOn: aStream.
+
+    "Created: / 15-01-2013 / 17:51:35 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 23-01-2013 / 14:42:23 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
+!JavaClassPathBundle methodsFor:'initialization'!
+
+initialize
+    "Invoked when a new instance is created."
+
+    "/ please change as required (and remove this comment)
+    libraries := nil.
+    environment := EnvironmentBundle new name:'CLASSPATH'.
+    packages := PackagesBundle new name:'Package libraries'.
+    user := JavaCodeBundle new name:'User libraries'.
+
+
+    "/ super initialize.   -- commented since inherited method does nothing
+
+    "Created: / 15-01-2013 / 17:49:14 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 16-01-2013 / 13:29:57 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
+!JavaClassPathBundle::EnvironmentBundle class methodsFor:'documentation'!
+
+documentation
+"
+    A special 'dynamic' code bundle to represent java code paths
+    specified in CLASSPATH environment variable.
+
+    [author:]
+        Jan Vrany <jan.vrany@fit.cvut.cz>
+
+    [instance variables:]
+
+    [class variables:]
+
+    [see also:]
+
+"
+! !
+
+!JavaClassPathBundle::EnvironmentBundle methodsFor:'adding & removing'!
+
+add: libraryOrBundle
+
+    self shouldNotImplement
+
+    "Created: / 15-01-2013 / 17:31:43 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+remove: libraryOrBundle
+
+    self shouldNotImplement
+
+    "Created: / 15-01-2013 / 17:31:52 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
+!JavaClassPathBundle::PackagesBundle class methodsFor:'documentation'!
+
+documentation
+"
+    A special 'dynamic' code bundle to represent all bundles
+    provided by individual packages.
+
+    [author:]
+        Jan Vrany <jan.vrany@fit.cvut.cz>
+
+    [instance variables:]
+
+    [class variables:]
+
+    [see also:]
+
+"
+! !
+
+!JavaClassPathBundle::PackagesBundle methodsFor:'accessing'!
+
+libraries
+
+    ^ProjectDefinition allSubclasses collect:[:e|e javaBundle] thenSelect:[:e|e notNil].
+
+    "
+    Java::PackagesBundle new libraries
+    "
+
+    "Created: / 15-01-2013 / 17:34:05 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
+!JavaClassPathBundle::PackagesBundle methodsFor:'adding & removing'!
+
+add: libraryOrBundle
+
+    self shouldNotImplement
+
+    "Created: / 15-01-2013 / 17:31:56 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+remove: libraryOrBundle
+
+    self shouldNotImplement
+
+    "Created: / 15-01-2013 / 17:31:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
+!JavaClassPathBundle class methodsFor:'documentation'!
+
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
+! !
+
--- a/JavaClassRegistry.st	Thu Jan 24 15:35:33 2013 +0000
+++ b/JavaClassRegistry.st	Thu Jan 24 15:49:03 2013 +0000
@@ -106,7 +106,10 @@
     class := self classNamed: className loader: classLoader.
     class notNil ifTrue: [ ^ class ].
     "if java vm is booted, nil class loader means system class loader, lets check it too"
-    (vm booted and: [classLoader isNil]) ifTrue: [class := self classNamed: className loader: vm systemClassLoader. class notNil ifTrue: [^class]].
+    (vm booted and: [classLoader isNil]) ifTrue: [
+        class := self classNamed: className loader: vm systemClassLoader. 
+        class notNil ifTrue: [^class]
+    ].
      "otherwise evaluate block"
     class := block value.
     class notNil ifTrue: [
@@ -116,6 +119,7 @@
     "Created: / 21-10-2011 / 12:00:30 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
     "Created: / 23-10-2011 / 11:36:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified: / 02-11-2011 / 17:29:20 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+    "Modified (format): / 24-01-2013 / 11:19:07 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 classNamed: className
@@ -329,13 +333,12 @@
     classes isNil ifTrue:[
         classes := loaders at: newClass classLoader put: Dictionary new.
     ].
-    classes at: newClass name put: newClass.
-
+    classes at: newClass name  put: newClass.
     self registerClassInSmalltalk: newClass notify: true.
 
     "Created: / 23-10-2011 / 11:53:58 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified: / 02-11-2011 / 18:40:52 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
-    "Modified: / 13-04-2012 / 19:04:41 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 24-01-2013 / 11:31:49 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 registerClassInSmalltalk: javaclass notify: doNotify
@@ -471,3 +474,4 @@
 version_SVN
     ^ '§Id§'
 ! !
+
--- a/JavaRelease.st	Thu Jan 24 15:35:33 2013 +0000
+++ b/JavaRelease.st	Thu Jan 24 15:49:03 2013 +0000
@@ -21,8 +21,8 @@
 "{ Package: 'stx:libjava' }"
 
 Object subclass:#JavaRelease
-	instanceVariableNames:'javaHome classPath sourcePath classes bootClassPathClasses
-		extDirsClasses bundle'
+	instanceVariableNames:'javaHome sourcePath classes bootClassPathClasses extDirsClasses
+		bundle bootClassPath'
 	classVariableNames:''
 	poolDictionaries:''
 	category:'Languages-Java-Support'
@@ -213,79 +213,31 @@
 bootClassPath
     "Returns a default value of sun.boot.class.path"
 
-    OperatingSystem isUNIXlike ifTrue: [ ^ self bootClassPathOnUNIX ].
-    OperatingSystem isMSWINDOWSlike ifTrue: [ ^ self bootClassPathOnWindows ].
-    self error: 'Unsupported platform'.
-    ^ #().
+
+    bootClassPath isNil ifTrue:[
+        | libs |
+
+        libs := self jreHome / 'lib'.
+        bootClassPath := OrderedCollection new.
+        libs directoryContentsAsFilenames do:[:each|
+            (each pathName endsWith:'.jar') ifTrue:[
+                (each pathName endsWith: 'rt.jar') ifTrue:[
+                    bootClassPath addFirst: each pathName
+                ] ifFalse:[
+                    bootClassPath addLast: each pathName
+                ]
+            ].
+        ].
+    ].
+    ^bootClassPath.
+
+    "
+    Java release bootClassPath
+    "
 
     "Created: / 02-11-2011 / 12:19:43 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
     "Modified (format): / 31-07-2012 / 10:16:25 / jv"
-!
-
-bootClassPathOnUNIX
-    "Not known..."
-    ^#()
-
-    "Created: / 02-11-2011 / 12:33:19 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
-    "Modified: / 27-07-2012 / 00:23:40 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-bootClassPathOnWindows
-    "Should be same as on UNIX (computed relative to classPath)"
-
-    ^self bootClassPathOnUNIX
-
-    "Created: / 02-11-2011 / 12:33:22 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
-    "Modified: / 31-07-2012 / 10:16:14 / jv"
-!
-
-classPath
-
-    "Returns a default class path"
-
-    classPath isNil ifTrue:[self searchForClassPath].
-    ^classPath
-
-    "
-        JavaRelease openJDK6 classPath
-    "
-
-    "Created: / 27-10-2010 / 19:20:24 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 08-01-2013 / 12:20:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-codeBundle
-    "Return a code bundle representing this Java release
-     (JDK)"
-
-    | src_zip |
-
-    bundle isNil ifTrue:[
-        | b |
-        b := JavaCodeBundle new.
-        b name: self name.
-        src_zip := self sourcePath detect:[:p|p endsWith:  'src.zip'] ifNone:[nil].
-
-        self classPath do:[:p|
-            | lib |
-
-            lib := JavaCodeLibrary new.
-            lib name: p asFilename baseName.
-            lib classes: p.
-            lib sources: src_zip.
-            b add: lib.
-        ].
-        bundle := b.
-    ].
-    ^bundle
-
-    "
-        Java release codeBundle
-    "
-
-    "Created: / 12-01-2013 / 15:50:58 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 15-01-2013 / 16:44:34 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified (comment): / 23-01-2013 / 12:25:28 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 23-01-2013 / 15:18:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 javaExtDirs
@@ -487,9 +439,9 @@
 
     stream nextPutAll: '== Java release config =='; cr.
     dumper value: 'name' value: self name value: false.
-    dumper value: 'java home' value: self javaHome value: true.
-    dumper value: 'jre  home' value: self jreHome asString value: true.
-    dumper value: 'class path' value: self classPath value: true.
+    dumper value: 'JAVA home' value: self javaHome value: true.
+    dumper value: 'JRE  home' value: self jreHome asString value: true.
+    dumper value: 'JDK  home' value: self jdkHome asString value: true.
     dumper value: 'boot class path' value: self bootClassPath value: true.
     dumper value: 'ext dirs' value: self javaExtDirs value: true.
 
@@ -499,6 +451,7 @@
     "
 
     "Created: / 10-12-2011 / 12:55:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 23-01-2013 / 15:24:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !JavaRelease methodsFor:'displaying'!
@@ -516,16 +469,16 @@
     self bootClassPath do: [:file | 
         | filename |
 
-        filename := file pathName.            
+        filename := file asFilename.            
         
-        self assert: (file suffix = 'jar').
-        self assert: (file exists).
-        self selectAllClassNamesIn: filename to: bootClassPathClasses.
+        self assert: (filename suffix = 'jar').
+        self assert: (filename exists).
+        self selectAllClassNamesIn: file to: bootClassPathClasses.
     ].
 
     "Created: / 02-11-2011 / 12:12:50 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
-    "Modified: / 02-11-2011 / 23:46:39 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified: / 19-07-2012 / 11:02:41 / jv"
+    "Modified: / 23-01-2013 / 17:24:44 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 initializeClassIndex
@@ -658,51 +611,6 @@
 
 !JavaRelease methodsFor:'searching'!
 
-searchForClassPath
-
-    | jreHome jdkHome |
-    bundle := nil.
-    classPath := OrderedCollection new.
-    jreHome := self jreHome asFilename.
-    jdkHome := self jdkHome asFilename.
-    jreHome isNil ifTrue:[ ^ #() ].
-    "Ensure, that rt.jar is first"
-    classPath add: (jreHome / 'lib' / 'rt.jar') pathName.
-
-    self searchForClassPathIn: jreHome / 'lib' .
-    self searchForClassPathIn: jreHome / 'lib' / 'modules'.
-
-    "Search for JDK tools (javac & co)"
-    (jdkHome notNil and:[(jdkHome / 'lib') exists]) ifTrue:[
-        self searchForClassPathIn: jdkHome / 'lib'
-    ].
-    ^self classPath
-
-    "
-        Java release searchForClassPath.
-        Java release classPath.
-    
-    "
-
-    "Created: / 27-10-2010 / 21:15:00 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 23-01-2013 / 12:26:07 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-searchForClassPathIn: dir 
-    dir exists ifFalse: [ ^ self ].
-    dir directoryContentsAsFilenames do: [
-        :file | 
-        " this is to make sure that rt.jar is always first --v     "
-        (file suffix = 'jar' and: [ file baseName ~= 'rt.jar' ]) ifTrue: [
-            classPath add: file pathName.
-        ]
-    ]
-
-    "Created: / 27-10-2010 / 21:38:39 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 02-11-2011 / 17:49:59 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
-    "Modified: / 12-01-2013 / 15:55:11 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
 searchForJavaHome
 
     | h |
@@ -814,20 +722,6 @@
 
 !JavaRelease::Custom methodsFor:'accessing'!
 
-bootClassPathOnUNIX
-    | jre bcp jar |
-    jre := self jreHome.
-    bcp := OrderedCollection new.
-    bcp add: jre / 'lib' / 'rt.jar'.
-    (jar := jre / 'lib' / 'resources.jar') exists ifTrue:[ bcp add: jar ].        
-    (jar := jre / 'lib' / 'jsse.jar') exists ifTrue:[ bcp add: jar ].
-    (jar := jre / 'lib' / 'jce.jar') exists ifTrue:[ bcp add: jar ].
-    (jar := jre / 'lib' / 'charsets.jar') exists ifTrue:[ bcp add: jar ].
-    ^bcp.
-
-    "Modified: / 31-07-2012 / 10:18:42 / jv"
-!
-
 javaHome
 
     "Answer a Java home"
@@ -956,27 +850,6 @@
 
 !JavaRelease::OpenJDK6 methodsFor:'accessing'!
 
-bootClassPathOnUNIX
-
-    | jre |
-    jre := self jreHome.
-
-    ^ {
-            jre / 'lib' / 'resources.jar' .
-            jre / 'lib' / 'rt.jar' .
-            jre / 'lib' / 'jsse.jar' .
-            jre / 'lib' / 'jce.jar' .
-            jre / 'lib' / 'charsets.jar' .
-    }
-
-    "
-        JavaRelease openJDK6 bootClassPathOnUNIX
-    "
-
-    "Created: / 02-11-2011 / 12:36:29 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
-    "Modified (comment): / 02-11-2011 / 23:39:54 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
 javaExtDirsOnUNIX
 
     ^{
@@ -1189,19 +1062,6 @@
 
 !JavaRelease::SunJDK122 methodsFor:'accessing'!
 
-bootClassPathOnUNIX
-    | jre |
-
-    jre := self javaHome.
-    ^jre notNil ifTrue:[
-        Array with: (jre / 'lib' / 'rt.jar')
-    ] ifFalse:[
-        #()
-    ]
-
-    "Created: / 31-07-2012 / 10:20:24 / jv"
-!
-
 javaHomesOnUNIX
     "superclass JavaRelease says that I am responsible to implement this method"
 
--- a/JavaResolver.st	Thu Jan 24 15:35:33 2013 +0000
+++ b/JavaResolver.st	Thu Jan 24 15:49:03 2013 +0000
@@ -143,16 +143,19 @@
      public but was changed to be non-public after D was compiled.
      
      If steps 1 and 2 succeed but step 3 fails, C is still valid and usable. Nevertheless, resolution
-     fails, and D is prohibited from accessing C." "JV@2011-08-10: HACK FOR SAXON DEMO!!!!!!" "(self checkPermissionsFrom: aJavaClassRef owner to: result)" "JV@2011-12-07: HACK FOR TOMCAT DEMO :-))"  
-        (self checkPermissionsFrom: aJavaClassRef owner to: result) ifTrue: [
-            ^ result
-        ] ifFalse: [ self throwIllegalAccessError ].
+     fails, and D is prohibited from accessing C." 
+
+    (self checkPermissionsFrom: aJavaClassRef owner to: result) ifFalse: [
+        self throwIllegalAccessError. 
+        ^nil.
+    ].
+    ^result
 
     "Created: / 11-04-2011 / 19:07:19 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
     "Created: / 12-08-2011 / 22:19:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified (comment): / 03-10-2011 / 23:03:01 / m"
-    "Modified: / 22-08-2012 / 13:02:15 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified: / 01-12-2012 / 13:44:54 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+    "Modified: / 23-01-2013 / 15:29:26 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !JavaResolver methodsFor:'class resolving helpers'!
@@ -625,4 +628,5 @@
     ^ '§Id§'
 ! !
 
+
 JavaResolver initialize!
--- a/JavaRootBundle.st	Thu Jan 24 15:35:33 2013 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,260 +0,0 @@
-"
- COPYRIGHT (c) 1996-2011 by Claus Gittinger
-
- New code and modifications done at SWING Research Group [1]:
-
- COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
-                            SWING Research Group, Czech Technical University in Prague
-
- This software is furnished under a license and may be used
- only in accordance with the terms of that license and with the
- inclusion of the above copyright notice.   This software may not
- be provided or otherwise made available to, or used by, any
- other person.  No title to or ownership of the software is
- hereby transferred.
-
- [1] Code written at SWING Research Group contains a signature
-     of one of the above copright owners. For exact set of such code,
-     see the differences between this version and version stx:libjava
-     as of 1.9.2010
-"
-"{ Package: 'stx:libjava' }"
-
-JavaCodeBundle subclass:#JavaRootBundle
-	instanceVariableNames:'release environment packages user'
-	classVariableNames:''
-	poolDictionaries:''
-	category:'Languages-Java-Support-Libraries'
-!
-
-JavaCodeBundle subclass:#EnvironmentBundle
-	instanceVariableNames:''
-	classVariableNames:''
-	poolDictionaries:''
-	privateIn:JavaRootBundle
-!
-
-JavaCodeBundle subclass:#PackagesBundle
-	instanceVariableNames:''
-	classVariableNames:''
-	poolDictionaries:''
-	privateIn:JavaRootBundle
-!
-
-!JavaRootBundle class methodsFor:'documentation'!
-
-copyright
-"
- COPYRIGHT (c) 1996-2011 by Claus Gittinger
-
- New code and modifications done at SWING Research Group [1]:
-
- COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
-                            SWING Research Group, Czech Technical University in Prague
-
- This software is furnished under a license and may be used
- only in accordance with the terms of that license and with the
- inclusion of the above copyright notice.   This software may not
- be provided or otherwise made available to, or used by, any
- other person.  No title to or ownership of the software is
- hereby transferred.
-
- [1] Code written at SWING Research Group contains a signature
-     of one of the above copright owners. For exact set of such code,
-     see the differences between this version and version stx:libjava
-     as of 1.9.2010
-
-"
-!
-
-documentation
-"
-    A top-level bundle representing all accessible Java code
-
-    [author:]
-        Jan Vrany <jan.vrany@fit.cvut.cz>
-
-    [instance variables:]
-
-    [class variables:]
-
-    [see also:]
-
-"
-! !
-
-!JavaRootBundle methodsFor:'accessing'!
-
-libraries
-    {
-        self release.
-        environment.
-        packages.
-        user.
-    }
-
-    "Created: / 15-01-2013 / 17:50:30 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 16-01-2013 / 12:42:41 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-name
-    ^ name ? '<root>'
-
-    "Created: / 15-01-2013 / 17:50:40 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-release
-    ^Java release codeBundle
-
-    "Modified: / 15-01-2013 / 17:59:14 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-
-!JavaRootBundle methodsFor:'adding & removing'!
-
-add: libraryOrBundle
-
-    self shouldNotImplement
-
-    "Created: / 15-01-2013 / 17:31:43 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-remove: libraryOrBundle
-
-    self shouldNotImplement
-
-    "Created: / 15-01-2013 / 17:31:52 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-
-!JavaRootBundle methodsFor:'generating'!
-
-classPathOn:aStream
-    "superclass JavaCodeLibraryOrBundle says that I am responsible to implement this method"
-
-    self release classPathOn: aStream.
-    environment classPathOn: aStream.
-    packages classPathOn: aStream.
-    user classPathOn: aStream.
-
-    "Created: / 15-01-2013 / 17:51:19 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 16-01-2013 / 12:42:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-sourcePathOn:aStream
-    "superclass JavaCodeLibraryOrBundle says that I am responsible to implement this method"
-
-    self release sourcePathOn: aStream.
-    environment sourcePathOn: aStream.
-    packages sourcePathOn: aStream.
-    user sourcePathOn: aStream.
-
-    "Created: / 15-01-2013 / 17:51:35 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 16-01-2013 / 12:42:47 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-
-!JavaRootBundle methodsFor:'initialization'!
-
-initialize
-    "Invoked when a new instance is created."
-
-    "/ please change as required (and remove this comment)
-    libraries := nil.
-    environment := EnvironmentBundle new name:'CLASSPATH'.
-    packages := PackagesBundle new name:'Package libraries'.
-    user := JavaCodeBundle new name:'User libraries'.
-
-
-    "/ super initialize.   -- commented since inherited method does nothing
-
-    "Created: / 15-01-2013 / 17:49:14 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 16-01-2013 / 13:29:57 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-
-!JavaRootBundle::EnvironmentBundle class methodsFor:'documentation'!
-
-documentation
-"
-    A special 'dynamic' code bundle to represent java code paths
-    specified in CLASSPATH environment variable.
-
-    [author:]
-        Jan Vrany <jan.vrany@fit.cvut.cz>
-
-    [instance variables:]
-
-    [class variables:]
-
-    [see also:]
-
-"
-! !
-
-!JavaRootBundle::EnvironmentBundle methodsFor:'adding & removing'!
-
-add: libraryOrBundle
-
-    self shouldNotImplement
-
-    "Created: / 15-01-2013 / 17:31:43 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-remove: libraryOrBundle
-
-    self shouldNotImplement
-
-    "Created: / 15-01-2013 / 17:31:52 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-
-!JavaRootBundle::PackagesBundle class methodsFor:'documentation'!
-
-documentation
-"
-    A special 'dynamic' code bundle to represent all bundles
-    provided by individual packages.
-
-    [author:]
-        Jan Vrany <jan.vrany@fit.cvut.cz>
-
-    [instance variables:]
-
-    [class variables:]
-
-    [see also:]
-
-"
-! !
-
-!JavaRootBundle::PackagesBundle methodsFor:'accessing'!
-
-libraries
-
-    ^ProjectDefinition allSubclasses collect:[:e|e javaBundle] thenSelect:[:e|e notNil].
-
-    "
-    Java::PackagesBundle new libraries
-    "
-
-    "Created: / 15-01-2013 / 17:34:05 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-
-!JavaRootBundle::PackagesBundle methodsFor:'adding & removing'!
-
-add: libraryOrBundle
-
-    self shouldNotImplement
-
-    "Created: / 15-01-2013 / 17:31:56 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-remove: libraryOrBundle
-
-    self shouldNotImplement
-
-    "Created: / 15-01-2013 / 17:31:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-
-!JavaRootBundle class methodsFor:'documentation'!
-
-version_HG
-
-    ^ '$Changeset: <not expanded> $'
-! !
--- a/JavaVM.st	Thu Jan 24 15:35:33 2013 +0000
+++ b/JavaVM.st	Thu Jan 24 15:49:03 2013 +0000
@@ -2537,10 +2537,10 @@
 
 
     ^ self classForName: className asSlashedJavaClassName
-        definedBy: (JavaClassReader classLoaderQuerySignal query) "? SystemClassLoader".
-
-    "Modified: / 30-10-2011 / 17:46:07 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+        definedBy: (JavaClassReader classLoaderQuerySignal query) "? SystemClassLoader."
+
     "Modified: / 02-11-2011 / 16:33:36 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+    "Modified: / 23-01-2013 / 16:13:48 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 classForName: className definedBy: classLoader
@@ -2731,13 +2731,13 @@
 
 usePrimordialCLToLoadClassNamed: className
     | class |
-    JavaClassReader classLoaderQuerySignal answer: nil
-        do: [
-            class := JavaClassReader readClass: className.
-        ].
+    JavaClassReader classLoaderQuerySignal answer: nil do: [
+        class := JavaClassReader readClass: className classPath: Java release bootClassPath  
+    ].
     ^ class
 
     "Modified: / 02-11-2011 / 17:28:08 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+    "Modified: / 23-01-2013 / 15:18:53 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 useUserDefinedCL: classLoader toLoadClassNamed: className
@@ -2981,7 +2981,7 @@
     |s|
 
     s := '' writeStream.
-    Java release classPath
+    Java release bootClassPath
         do:[:p | s nextPutAll:p asString]
         separatedBy: [s nextPut: OperatingSystem pathSeparator].
 
@@ -2992,6 +2992,7 @@
     "
 
     "Created: / 10-12-2010 / 14:37:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 23-01-2013 / 15:19:08 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 defaultWindowingToolKit
@@ -19991,4 +19992,5 @@
     ^ '§Id§'
 ! !
 
+
 JavaVM initialize!
--- a/Make.proto	Thu Jan 24 15:35:33 2013 +0000
+++ b/Make.proto	Thu Jan 24 15:49:03 2013 +0000
@@ -266,10 +266,10 @@
 $(OUTDIR)ProxyMethodJavaFieldAccessor.$(O) ProxyMethodJavaFieldAccessor.$(H): ProxyMethodJavaFieldAccessor.st $(INCLUDE_TOP)/stx/libjava/ProxyMethodNode.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)JavaByteCodePreresolver.$(O) JavaByteCodePreresolver.$(H): JavaByteCodePreresolver.st $(INCLUDE_TOP)/stx/libjava/JavaByteCodeProcessorAdapter.$(H) $(INCLUDE_TOP)/stx/libjava/JavaByteCodeProcessor.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)JavaClass.$(O) JavaClass.$(H): JavaClass.st $(INCLUDE_TOP)/stx/libjava/JavaConstants.$(H) $(INCLUDE_TOP)/stx/libjava/JavaBehavior.$(H) $(INCLUDE_TOP)/stx/libbasic/Class.$(H) $(INCLUDE_TOP)/stx/libbasic/ClassDescription.$(H) $(INCLUDE_TOP)/stx/libbasic/Behavior.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)JavaClassPathBundle.$(O) JavaClassPathBundle.$(H): JavaClassPathBundle.st $(INCLUDE_TOP)/stx/libjava/JavaCodeBundle.$(H) $(INCLUDE_TOP)/stx/libjava/JavaCodeLibraryOrBundle.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)JavaFieldRef2.$(O) JavaFieldRef2.$(H): JavaFieldRef2.st $(INCLUDE_TOP)/stx/libjava/JavaClassContentRef2.$(H) $(INCLUDE_TOP)/stx/libjava/JavaRef2.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)JavaMethodRef2.$(O) JavaMethodRef2.$(H): JavaMethodRef2.st $(INCLUDE_TOP)/stx/libjava/JavaClassContentRef2.$(H) $(INCLUDE_TOP)/stx/libjava/JavaRef2.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)JavaMethodWithException.$(O) JavaMethodWithException.$(H): JavaMethodWithException.st $(INCLUDE_TOP)/stx/libjava/JavaMethod.$(H) $(INCLUDE_TOP)/stx/libbasic/CompiledCode.$(H) $(INCLUDE_TOP)/stx/libbasic/ExecutableFunction.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)JavaRootBundle.$(O) JavaRootBundle.$(H): JavaRootBundle.st $(INCLUDE_TOP)/stx/libjava/JavaCodeBundle.$(H) $(INCLUDE_TOP)/stx/libjava/JavaCodeLibraryOrBundle.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)ProxyMethodAndNode.$(O) ProxyMethodAndNode.$(H): ProxyMethodAndNode.st $(INCLUDE_TOP)/stx/libjava/ProxyMethodConditionNode.$(H) $(INCLUDE_TOP)/stx/libjava/ProxyMethodNode.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)ProxyMethodBlockInvocationNode.$(O) ProxyMethodBlockInvocationNode.$(H): ProxyMethodBlockInvocationNode.st $(INCLUDE_TOP)/stx/libjava/ProxyMethodInvocationNode.$(H) $(INCLUDE_TOP)/stx/libjava/ProxyMethodNode.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)ProxyMethodJavaFieldGetter.$(O) ProxyMethodJavaFieldGetter.$(H): ProxyMethodJavaFieldGetter.st $(INCLUDE_TOP)/stx/libjava/ProxyMethodJavaFieldAccessor.$(H) $(INCLUDE_TOP)/stx/libjava/ProxyMethodNode.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
--- a/Make.spec	Thu Jan 24 15:35:33 2013 +0000
+++ b/Make.spec	Thu Jan 24 15:49:03 2013 +0000
@@ -168,7 +168,7 @@
 	JavaClassQuery \
 	JavaCodeLibraryOrBundle \
 	JavaCodeBundle \
-	JavaRootBundle \
+	JavaClassPathBundle \
 	JavaCodeLibrary \
 
 
@@ -293,7 +293,7 @@
     $(OUTDIR_SLASH)JavaClassQuery.$(O) \
     $(OUTDIR_SLASH)JavaCodeLibraryOrBundle.$(O) \
     $(OUTDIR_SLASH)JavaCodeBundle.$(O) \
-    $(OUTDIR_SLASH)JavaRootBundle.$(O) \
+    $(OUTDIR_SLASH)JavaClassPathBundle.$(O) \
     $(OUTDIR_SLASH)JavaCodeLibrary.$(O) \
     $(OUTDIR_SLASH)extensions.$(O) \
 
--- a/abbrev.stc	Thu Jan 24 15:35:33 2013 +0000
+++ b/abbrev.stc	Thu Jan 24 15:49:03 2013 +0000
@@ -146,5 +146,5 @@
 JavaLookupTestsResource JavaLookupTestsResource stx:libjava 'Languages-Java-Tests-Interop' 3
 JavaCodeLibraryOrBundle JavaCodeLibraryOrBundle stx:libjava 'Languages-Java-Support-Libraries' 0
 JavaCodeBundle JavaCodeBundle stx:libjava 'Languages-Java-Support-Libraries' 0
-JavaRootBundle JavaRootBundle stx:libjava 'Languages-Java-Support-Libraries' 0
+JavaClassPathBundle JavaClassPathBundle stx:libjava 'Languages-Java-Support-Libraries' 0
 JavaCodeLibrary JavaCodeLibrary stx:libjava 'Languages-Java-Support-Libraries' 0
--- a/bc.mak	Thu Jan 24 15:35:33 2013 +0000
+++ b/bc.mak	Thu Jan 24 15:49:03 2013 +0000
@@ -200,10 +200,10 @@
 $(OUTDIR)ProxyMethodJavaFieldAccessor.$(O) ProxyMethodJavaFieldAccessor.$(H): ProxyMethodJavaFieldAccessor.st $(INCLUDE_TOP)\stx\libjava\ProxyMethodNode.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)JavaByteCodePreresolver.$(O) JavaByteCodePreresolver.$(H): JavaByteCodePreresolver.st $(INCLUDE_TOP)\stx\libjava\JavaByteCodeProcessorAdapter.$(H) $(INCLUDE_TOP)\stx\libjava\JavaByteCodeProcessor.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)JavaClass.$(O) JavaClass.$(H): JavaClass.st $(INCLUDE_TOP)\stx\libjava\JavaConstants.$(H) $(INCLUDE_TOP)\stx\libjava\JavaBehavior.$(H) $(INCLUDE_TOP)\stx\libbasic\Class.$(H) $(INCLUDE_TOP)\stx\libbasic\ClassDescription.$(H) $(INCLUDE_TOP)\stx\libbasic\Behavior.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)JavaClassPathBundle.$(O) JavaClassPathBundle.$(H): JavaClassPathBundle.st $(INCLUDE_TOP)\stx\libjava\JavaCodeBundle.$(H) $(INCLUDE_TOP)\stx\libjava\JavaCodeLibraryOrBundle.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)JavaFieldRef2.$(O) JavaFieldRef2.$(H): JavaFieldRef2.st $(INCLUDE_TOP)\stx\libjava\JavaClassContentRef2.$(H) $(INCLUDE_TOP)\stx\libjava\JavaRef2.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)JavaMethodRef2.$(O) JavaMethodRef2.$(H): JavaMethodRef2.st $(INCLUDE_TOP)\stx\libjava\JavaClassContentRef2.$(H) $(INCLUDE_TOP)\stx\libjava\JavaRef2.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)JavaMethodWithException.$(O) JavaMethodWithException.$(H): JavaMethodWithException.st $(INCLUDE_TOP)\stx\libjava\JavaMethod.$(H) $(INCLUDE_TOP)\stx\libbasic\CompiledCode.$(H) $(INCLUDE_TOP)\stx\libbasic\ExecutableFunction.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)JavaRootBundle.$(O) JavaRootBundle.$(H): JavaRootBundle.st $(INCLUDE_TOP)\stx\libjava\JavaCodeBundle.$(H) $(INCLUDE_TOP)\stx\libjava\JavaCodeLibraryOrBundle.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)ProxyMethodAndNode.$(O) ProxyMethodAndNode.$(H): ProxyMethodAndNode.st $(INCLUDE_TOP)\stx\libjava\ProxyMethodConditionNode.$(H) $(INCLUDE_TOP)\stx\libjava\ProxyMethodNode.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)ProxyMethodBlockInvocationNode.$(O) ProxyMethodBlockInvocationNode.$(H): ProxyMethodBlockInvocationNode.st $(INCLUDE_TOP)\stx\libjava\ProxyMethodInvocationNode.$(H) $(INCLUDE_TOP)\stx\libjava\ProxyMethodNode.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)ProxyMethodJavaFieldGetter.$(O) ProxyMethodJavaFieldGetter.$(H): ProxyMethodJavaFieldGetter.st $(INCLUDE_TOP)\stx\libjava\ProxyMethodJavaFieldAccessor.$(H) $(INCLUDE_TOP)\stx\libjava\ProxyMethodNode.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
--- a/java/extensions/java/lang/Byte.st	Thu Jan 24 15:35:33 2013 +0000
+++ b/java/extensions/java/lang/Byte.st	Thu Jan 24 15:49:03 2013 +0000
@@ -1,4 +1,6 @@
-"{ Package: 'stx:libjava' }"!
+"{ Package: 'stx:libjava' }"
+
+!
 
 !(Java classForName:'java.lang.Byte') class methodsFor:'* proxies *'!
 
@@ -8,7 +10,6 @@
     inst perform: #'<init>(B)V' with: object.
 	^ inst.
 ! !
-
 !(Java classForName:'java.lang.Byte') class methodsFor:'* proxies *'!
 
 javaWrapRequired
@@ -19,4 +20,3 @@
 
     ^true
 ! !
-
--- a/java/extensions/java/lang/Double.st	Thu Jan 24 15:35:33 2013 +0000
+++ b/java/extensions/java/lang/Double.st	Thu Jan 24 15:49:03 2013 +0000
@@ -1,4 +1,6 @@
-"{ Package: 'stx:libjava' }"!
+"{ Package: 'stx:libjava' }"
+
+!
 
 !(Java classForName:'java.lang.Double') class methodsFor:'queries'!
 
@@ -8,7 +10,6 @@
     inst perform: #'<init>(D)V' with: object with: nil.
 	^ inst.
 ! !
-
 !(Java classForName:'java.lang.Double') class methodsFor:'queries'!
 
 javaWrapRequired
@@ -19,4 +20,3 @@
 
     ^true
 ! !
-
--- a/java/extensions/java/lang/Float.st	Thu Jan 24 15:35:33 2013 +0000
+++ b/java/extensions/java/lang/Float.st	Thu Jan 24 15:49:03 2013 +0000
@@ -1,4 +1,6 @@
-"{ Package: 'stx:libjava' }"!
+"{ Package: 'stx:libjava' }"
+
+!
 
 !(Java classForName:'java.lang.Float') class methodsFor:'queries'!
 
@@ -8,7 +10,6 @@
     inst perform: #'<init>(F)V' with: object.
 	^ inst.
 ! !
-
 !(Java classForName:'java.lang.Float') class methodsFor:'queries'!
 
 javaWrapRequired
@@ -19,4 +20,3 @@
 
     ^true
 ! !
-
--- a/java/extensions/java/lang/Integer.st	Thu Jan 24 15:35:33 2013 +0000
+++ b/java/extensions/java/lang/Integer.st	Thu Jan 24 15:49:03 2013 +0000
@@ -1,4 +1,6 @@
-"{ Package: 'stx:libjava' }"!
+"{ Package: 'stx:libjava' }"
+
+!
 
 !(Java classForName:'java.lang.Integer') class methodsFor:'queries'!
 
@@ -8,7 +10,6 @@
 	inst perform: #'<init>(I)V' with: object.
 	^ inst.
 ! !
-
 !(Java classForName:'java.lang.Integer') class methodsFor:'queries'!
 
 javaWrapRequired
@@ -19,4 +20,3 @@
 
     ^true
 ! !
-
--- a/java/extensions/java/lang/Long.st	Thu Jan 24 15:35:33 2013 +0000
+++ b/java/extensions/java/lang/Long.st	Thu Jan 24 15:49:03 2013 +0000
@@ -1,4 +1,6 @@
-"{ Package: 'stx:libjava' }"!
+"{ Package: 'stx:libjava' }"
+
+!
 
 !(Java classForName:'java.lang.Long') class methodsFor:'queries'!
 
@@ -8,7 +10,6 @@
     inst perform: #'<init>(J)V' with: object with: nil.
 	^ inst.
 ! !
-
 !(Java classForName:'java.lang.Long') class methodsFor:'queries'!
 
 javaWrapRequired
@@ -19,4 +20,3 @@
 
     ^true
 ! !
-
--- a/libInit.cc	Thu Jan 24 15:35:33 2013 +0000
+++ b/libInit.cc	Thu Jan 24 15:49:03 2013 +0000
@@ -131,10 +131,10 @@
 _ProxyMethodJavaFieldAccessor_Init(pass,__pRT__,snd);
 _JavaByteCodePreresolver_Init(pass,__pRT__,snd);
 _JavaClass_Init(pass,__pRT__,snd);
+_JavaClassPathBundle_Init(pass,__pRT__,snd);
 _JavaFieldRef2_Init(pass,__pRT__,snd);
 _JavaMethodRef2_Init(pass,__pRT__,snd);
 _JavaMethodWithException_Init(pass,__pRT__,snd);
-_JavaRootBundle_Init(pass,__pRT__,snd);
 _ProxyMethodAndNode_Init(pass,__pRT__,snd);
 _ProxyMethodBlockInvocationNode_Init(pass,__pRT__,snd);
 _ProxyMethodJavaFieldGetter_Init(pass,__pRT__,snd);
--- a/stx_libjava.st	Thu Jan 24 15:35:33 2013 +0000
+++ b/stx_libjava.st	Thu Jan 24 15:49:03 2013 +0000
@@ -413,9 +413,11 @@
         (JavaLookupTestsResource autoload)
         JavaCodeLibraryOrBundle
         JavaCodeBundle
-        JavaRootBundle
+        JavaClassPathBundle
         JavaCodeLibrary
     )
+
+    "Modified: / 23-01-2013 / 16:15:33 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 extensionMethodNames
hg/stx-libjava