--- a/src/JavaUtilities.st	Mon Jul 30 13:45:56 2012 +0000
+++ b/src/JavaUtilities.st	Mon Jul 30 20:02:11 2012 +0000
@@ -125,13 +125,27 @@
 !
 
 sourcePath
-OperatingSystem getLoginName = 'm' ifTrue: [
-^ '/home/m/Projects/libjava/branches/jk_new_structure/src/examples/tomcat/apache-tomcat-6.0.35-src/java'
+
+    | pkgdir root path p |
+
+    pkgdir  := Smalltalk getPackageDirectoryForPackage: self class package.
+    pkgdir isNil ifTrue:[ ^ #() ].
+    root := pkgdir / 'examples' / 'tomcat' / 'apache-tomcat-6.0.35-src'.
+    OperatingSystem getLoginName = 'm' ifTrue: [
+        root := '/home/m/Projects/libjava/branches/jk_new_structure/src/examples/tomcat/apache-tomcat-6.0.35-src' asFilename
     ].
-    ^ '/home/jv/Projects/libjava/sources/libjava/branches/jk_new_structure/src/examples/tomcat/apache-tomcat-6.0.35-src/java'
+    OperatingSystem getLoginName = 'jv' ifTrue: [
+        root := '/home/jv/Projects/libjava/sources/libjava/branches/jk_new_structure/src/examples/tomcat/apache-tomcat-6.0.35-src/' asFilename
+    ].
+    root exists ifFalse:[ ^ #() ].
+    path := OrderedCollection new.
+    (p := root / 'java') exists ifTrue: [ path add: p ].
+    (p := root / 'java-extras') exists ifTrue: [ path add: p ].
+    ^path
 
     "Created: / 08-12-2011 / 23:16:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified: / 13-12-2011 / 14:33:42 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+    "Modified: / 30-07-2012 / 15:11:58 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !JavaUtilities::Tomcat6x methodsFor:'initialization'!
@@ -157,7 +171,7 @@
 
     Java addToClassPath: self classPath1.
     Java addToClassPath: self classPath2.
-    Java addToSourcePath: self sourcePath.
+    self sourcePath do:[:each|Java addToSourcePath:  each].
     JavaVM booted ifFalse:[self initializeVM].
     java_lang_System := Java classForName:'java.lang.System'.
 
@@ -178,7 +192,6 @@
         OldspaceIncreased := true.
     ].
 
-
     "Created: / 18-04-2012 / 08:08:45 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !