--- a/Java.st Sat Jan 12 16:42:57 2013 +0000
+++ b/Java.st Tue Jan 15 18:40:37 2013 +0000
@@ -22,13 +22,13 @@
Object subclass:#Java
instanceVariableNames:''
- classVariableNames:'Classes UnresolvedClassRefs Release ReleaseBundle PackagesBundle
- EnvironmentBundle UserBundle ClassPath ClassPathExt
- ExtensionsPath ExtensionsPathPackages CacheDirectory JavaHome
- InternedStrings Java_lang_String Java_lang_Class PrettyPrintStyle
- LastArgumentString Threads ExcludedClassPath FailedToLoadClasses
- SourceCache SourceArchiveCache JavaClassLoaderQuerySignal
- ClassLoaderQuerySignal ThreadsAccess'
+ classVariableNames:'Classes UnresolvedClassRefs Release ClassPath ClassPathPackages
+ ClassPathExt ExtensionsPath ExtensionsPathPackages
+ SourceDirectories SourceDirectoriesPackages CacheDirectory
+ JavaHome InternedStrings Java_lang_String Java_lang_Class
+ PrettyPrintStyle LastArgumentString Threads ExcludedClassPath
+ FailedToLoadClasses SourceCache SourceArchiveCache
+ JavaClassLoaderQuerySignal ClassLoaderQuerySignal ThreadsAccess'
poolDictionaries:''
category:'Languages-Java-Support'
!
@@ -165,7 +165,6 @@
release: aJavaRelease
Release := aJavaRelease.
- ReleaseBundle := aJavaRelease codeBundle
"
Java release: JavaRelease openJDK6.
@@ -174,7 +173,7 @@
"
"Created: / 22-11-2010 / 12:38:04 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified: / 12-01-2013 / 16:13:46 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 30-11-2010 / 11:54:33 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
systemPropertyAt:key put:something
@@ -266,10 +265,6 @@
SourceDirectories := UserPreferences current javaSourcePath decodeAsLiteralArray asOrderedCollection.
Threads := IdentityDictionary new.
- EnvironmentBundle := JavaCodeBundle new name: 'Environment'.
- PackagesBundle := JavaCodeBundle new name: 'Package libraries'.
- UserBundle := JavaCodeBundle new name: 'User libraries'.
-
ThreadsAccess := RecursionLock forMutualExclusion.
self initializeRelease. "lazy initialization of Release"
self initializePrettyPrintStyle.
@@ -285,7 +280,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: / 12-01-2013 / 16:21:54 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 27-07-2012 / 12:56:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
initializePrettyPrintStyle
@@ -749,12 +744,12 @@
!
classPath
- ^OrderedCollection streamContents:[:s|
- ReleaseBundle classPathOn: s.
- EnvironmentBundle classPathOn: s.
- PackagesBundle classPathOn: s.
- UserBundle classPathOn: s.
- ].
+
+ ^ ClassPath ,
+ self classPathFromEnvironment ,
+ self classPathFromPackages .
+
+
"/
"/ ^ "for testing only"
"/ "/Release classPath,
@@ -772,15 +767,17 @@
"
"Created: / 07-02-1997 / 19:23:45 / cg"
- "Modified (format): / 12-01-2013 / 16:20:00 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 13-12-2011 / 23:56:35 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
classPath:aCollectionOfPaths
- self error: 'No longer supported'
+ ClassPath := aCollectionOfPaths asOrderedCollection.
+ self classPathInRuntime: ClassPath.
+ FailedToLoadClasses := nil
"Created: / 07-02-1997 / 19:23:45 / cg"
"Modified: / 17-09-1998 / 20:44:09 / cg"
- "Modified: / 12-01-2013 / 16:14:31 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 02-08-2012 / 21:59:32 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
classPathAsString
@@ -790,7 +787,7 @@
!
effectiveClassPath
- ^self classPath
+ ^self effectiveClassPathForRelease: Release
"
Java effectiveClassPath
@@ -798,7 +795,8 @@
"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: / 12-01-2013 / 16:24:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 27-07-2012 / 18:31:38 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified (format): / 06-09-2012 / 11:19:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
effectiveExtensionsPath
@@ -817,13 +815,12 @@
!
effectiveSourceDirectories
- ^self sourceDirectories
+ ^self effectiveSourceDirectoriesForRelease: Release
"
Java effectiveSourceDirectories
"
"Created: / 30-11-2010 / 11:53:42 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified: / 12-01-2013 / 16:26:38 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
excludedClassPath
@@ -1106,6 +1103,30 @@
"Created: / 02-08-2012 / 16:04:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
+effectiveClassPathForRelease: release
+
+ ClassPathExt ifNil:[
+ ClassPathExt := OrderedCollection new.
+ self javaExtDirs do:[:dir|
+ dir isDirectory ifTrue:[
+ dir directoryContentsAsFilenamesDo:[:file|
+ file suffix = 'jar' ifTrue:[
+ ClassPathExt add: file pathName
+ ]
+ ]
+ ]
+ ]
+ ].
+
+ ^release classPath , "ClassPathExt ," self classPath
+
+ "
+ Java effectiveClassPath
+ "
+
+ "Created: / 27-07-2012 / 18:31:18 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
effectiveExtensionsPathForRelease: aRelease
^ (ExtensionsPath ? #()) ,
@@ -1114,6 +1135,18 @@
"Created: / 06-09-2012 / 11:27:48 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
+effectiveSourceDirectoriesForRelease: release
+
+ ^release sourcePath ,
+ self sourcePath
+
+ "
+ Java effectiveSourceDirectories
+ "
+
+ "Created: / 27-07-2012 / 18:31:58 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
extensionsPathFromPackages
ExtensionsPathPackages isNil ifTrue:[
@@ -1144,6 +1177,10 @@
"Created: / 06-09-2012 / 11:30:17 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
+sourceDirectories
+ ^ SourceDirectories
+!
+
sourceDirectories:aCollectionOfPaths
SourceDirectories := aCollectionOfPaths asOrderedCollection
@@ -1539,32 +1576,6 @@
"Modified: / 27-01-1999 / 20:40:30 / cg"
"Modified (format): / 23-02-2012 / 10:50:53 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-sourceDirectories
- ^OrderedCollection streamContents:[:s|
- ReleaseBundle sourcePathOn: s.
- EnvironmentBundle sourcePathOn: s.
- PackagesBundle sourcePathOn: s.
- UserBundle sourcePathOn: s.
- ].
-"/
-"/ ^ "for testing only"
-"/ "/Release classPath,
-"/
-"/ {(packagePath / 'java' / 'libjava-projects' / 'Conversion' / 'bin')
-"/ pathName.
-"/ (packagePath / 'java' / 'libjava-support' / 'bin') pathName}
-"/ , ((packagePath / 'java' / 'libs') directoryContentsAsFilenames
-"/ select:[:f | f suffix = 'jar']
-"/ thenCollect:[:f | f pathName])
-"/ , (ClassPath ? #()) , cp
-"/
- "
- Java classPath
- "
-
- "Modified: / 12-01-2013 / 16:25:46 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!Java class methodsFor:'starting apps'!
--- a/JavaCodeBundle.st Sat Jan 12 16:42:57 2013 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,116 +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' }"
-
-JavaCodeLibraryOrBundle subclass:#JavaCodeBundle
- instanceVariableNames:'libraries'
- classVariableNames:'Root'
- poolDictionaries:''
- category:'Languages-Java-Support-Libraries'
-!
-
-!JavaCodeBundle 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
-
-"
-! !
-
-!JavaCodeBundle class methodsFor:'instance creation'!
-
-new
- "return an initialized instance"
-
- ^ self basicNew initialize.
-! !
-
-!JavaCodeBundle methodsFor:'adding & removing'!
-
-add: libraryOrBundle
-
- libraries add: libraryOrBundle
-
- "Created: / 12-01-2013 / 16:08:26 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-remove: libraryOrBundle
-
- libraries remove: libraryOrBundle
-
- "Created: / 12-01-2013 / 16:08:31 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-
-!JavaCodeBundle methodsFor:'generating'!
-
-classPathOn:aStream
- "superclass JavaCodeLibraryOrBundle says that I am responsible to implement this method"
-
- ^ libraries do:[:each|each classPathOn: aStream].
-
- "Modified: / 12-01-2013 / 16:19:03 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-sourcePathOn:aStream
- "superclass JavaCodeLibraryOrBundle says that I am responsible to implement this method"
-
- ^ libraries do:[:each|each sourcePathOn: aStream].
-
- "Created: / 12-01-2013 / 16:24:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-
-!JavaCodeBundle methodsFor:'initialization'!
-
-initialize
- "Invoked when a new instance is created."
-
- "/ please change as required (and remove this comment)
- libraries := OrderedCollection new.
-
- "/ super initialize. -- commented since inherited method does nothing
-
- "Modified: / 12-01-2013 / 16:07:19 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-
-!JavaCodeBundle class methodsFor:'documentation'!
-
-version_HG
-
- ^ '$Changeset: <not expanded> $'
-! !
--- a/JavaCodeLibrary.st Sat Jan 12 16:42:57 2013 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,109 +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' }"
-
-JavaCodeLibraryOrBundle subclass:#JavaCodeLibrary
- instanceVariableNames:'classes sources javadoc'
- classVariableNames:''
- poolDictionaries:''
- category:'Languages-Java-Support-Libraries'
-!
-
-!JavaCodeLibrary 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
-
-"
-! !
-
-!JavaCodeLibrary methodsFor:'accessing'!
-
-classes
- ^ classes
-!
-
-classes:something
- classes := something.
-!
-
-javadoc
- ^ javadoc
-!
-
-javadoc:something
- javadoc := something.
-!
-
-sources
- ^ sources
-!
-
-sources:something
- sources := something.
-! !
-
-!JavaCodeLibrary methodsFor:'generating'!
-
-classPathOn:aStream
- "superclass JavaCodeLibraryOrBundle says that I am responsible to implement this method"
-
- classes asFilename isReadable ifTrue:[
- aStream nextPut: classes.
- ].
-
- "Modified: / 12-01-2013 / 16:19:40 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-sourcePathOn:aStream
- "superclass JavaCodeLibraryOrBundle says that I am responsible to implement this method"
-
- sources asFilename isReadable ifTrue:[
- aStream nextPut: sources.
- ].
-
- "Created: / 12-01-2013 / 16:24:58 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-
-!JavaCodeLibrary class methodsFor:'documentation'!
-
-version_HG
-
- ^ '$Changeset: <not expanded> $'
-! !
--- a/JavaCodeLibraryOrBundle.st Sat Jan 12 16:42:57 2013 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,103 +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' }"
-
-Object subclass:#JavaCodeLibraryOrBundle
- instanceVariableNames:'name'
- classVariableNames:''
- poolDictionaries:''
- category:'Languages-Java-Support-Libraries'
-!
-
-!JavaCodeLibraryOrBundle 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
-"
- Abstract class for JavaLibrary or JavaBundle
-
- [author:]
- Jan Vrany <jan.vrany@fit.cvut.cz>
-
- [instance variables:]
-
- [class variables:]
-
- [see also:]
-
-"
-! !
-
-!JavaCodeLibraryOrBundle methodsFor:'accessing'!
-
-name
- ^ name ? '???'
-
- "Modified: / 12-01-2013 / 16:06:56 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-name:something
- name := something.
-! !
-
-!JavaCodeLibraryOrBundle methodsFor:'generating'!
-
-classPathOn: aStream
- self subclassResponsibility
-
- "Created: / 12-01-2013 / 16:18:29 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-sourcePathOn: aStream
- self subclassResponsibility
-
- "Created: / 12-01-2013 / 16:24:41 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-
-!JavaCodeLibraryOrBundle class methodsFor:'documentation'!
-
-version_HG
-
- ^ '$Changeset: <not expanded> $'
-! !
--- a/JavaRelease.st Sat Jan 12 16:42:57 2013 +0000
+++ b/JavaRelease.st Tue Jan 15 18:40:37 2013 +0000
@@ -22,7 +22,7 @@
Object subclass:#JavaRelease
instanceVariableNames:'javaHome classPath sourcePath classes bootClassPathClasses
- extDirsClasses bundle'
+ extDirsClasses'
classVariableNames:''
poolDictionaries:''
category:'Languages-Java-Support'
@@ -254,32 +254,6 @@
"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:[
- bundle := JavaCodeBundle new.
- bundle name: self name.
- src_zip := self sourcePath detect:[:p|p baseName = 'src.zip'].
-
- self classPath do:[:p|
- | lib |
-
- lib := JavaCodeLibrary new.
- lib name: p baseName.
- lib source: src_zip.
-
- bundle add: lib.
- ].
- ].
- ^bundle
-
- "Created: / 12-01-2013 / 15:50:58 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
javaExtDirs
"Returns a default value of java.ext.dirs property"
@@ -627,13 +601,12 @@
searchForClassPath
| jreHome jdkHome |
- bundle := nil.
classPath := OrderedCollection new.
jreHome := self jreHome asFilename.
jdkHome := self javaHome asFilename.
jreHome isNil ifTrue:[ ^ #() ].
"Ensure, that rt.jar is first"
- classPath add: (jreHome / 'lib' / 'rt.jar') pathName.
+ classPath add: (JavaPathElement newFromRelease:(jreHome / 'lib' / 'rt.jar') asString).
self searchForClassPathIn: jreHome / 'lib' .
self searchForClassPathIn: jreHome / 'lib' / 'modules'.
@@ -651,7 +624,7 @@
"
"Created: / 27-10-2010 / 21:15:00 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified: / 12-01-2013 / 15:55:04 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 15-12-2012 / 01:05:04 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
searchForClassPathIn: dir
@@ -660,13 +633,13 @@
: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.
+ classPath add: (JavaPathElement newFromRelease:file asString)
]
]
"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>"
+ "Modified: / 27-07-2012 / 11:45:11 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
searchForJavaHome
@@ -714,11 +687,10 @@
| java_home src_zip |
sourcePath := OrderedCollection new.
- bundle := nil.
java_home := self javaHome.
java_home notNil ifTrue:[
src_zip := self javaHome asFilename / 'src.zip'.
- src_zip exists ifTrue:[sourcePath add: src_zip pathName].
+ src_zip exists ifTrue:[sourcePath add: (JavaPathElement newFromRelease:src_zip asString)].
].
"
@@ -726,7 +698,7 @@
"
"Created: / 27-10-2010 / 21:15:00 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified: / 12-01-2013 / 15:55:24 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 15-12-2012 / 14:57:52 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!JavaRelease methodsFor:'validating'!
@@ -1034,7 +1006,7 @@
java_homes do:[ :java_home |
src_zip := java_home asFilename directory / 'src.zip'.
- src_zip exists ifTrue:[sourcePath add: src_zip pathName].
+ src_zip exists ifTrue:[sourcePath add: (JavaPathElement newFromRelease:src_zip asString)].
].
"
@@ -1042,7 +1014,7 @@
"
"Created: / 03-09-2012 / 18:38:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified: / 12-01-2013 / 15:56:06 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 09-01-2013 / 17:09:37 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!JavaRelease::OpenJDK7 class methodsFor:'documentation'!
--- a/Make.proto Sat Jan 12 16:42:57 2013 +0000
+++ b/Make.proto Tue Jan 15 18:40:37 2013 +0000
@@ -180,7 +180,6 @@
$(OUTDIR)JavaClassQuery.$(O) JavaClassQuery.$(H): JavaClassQuery.st $(INCLUDE_TOP)/stx/libbasic/Query.$(H) $(INCLUDE_TOP)/stx/libbasic/Notification.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)JavaClassRegistry.$(O) JavaClassRegistry.$(H): JavaClassRegistry.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)JavaClassReloader.$(O) JavaClassReloader.$(H): JavaClassReloader.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)JavaCodeLibraryOrBundle.$(O) JavaCodeLibraryOrBundle.$(H): JavaCodeLibraryOrBundle.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)JavaCompiler_Eclipse.$(O) JavaCompiler_Eclipse.$(H): JavaCompiler_Eclipse.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)JavaConstantPool.$(O) JavaConstantPool.$(H): JavaConstantPool.st $(INCLUDE_TOP)/stx/libbasic/Array.$(H) $(INCLUDE_TOP)/stx/libbasic/ArrayedCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/SequenceableCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)JavaConstants.$(O) JavaConstants.$(H): JavaConstants.st $(INCLUDE_TOP)/stx/libbasic/SharedPool.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
@@ -245,8 +244,6 @@
$(OUTDIR)JavaClassContentRef2.$(O) JavaClassContentRef2.$(H): JavaClassContentRef2.st $(INCLUDE_TOP)/stx/libjava/JavaRef2.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)JavaClassReader.$(O) JavaClassReader.$(H): JavaClassReader.st $(INCLUDE_TOP)/stx/libjava/JavaConstants.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)JavaClassRef2.$(O) JavaClassRef2.$(H): JavaClassRef2.st $(INCLUDE_TOP)/stx/libjava/JavaRef2.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)JavaCodeBundle.$(O) JavaCodeBundle.$(H): JavaCodeBundle.st $(INCLUDE_TOP)/stx/libjava/JavaCodeLibraryOrBundle.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)JavaCodeLibrary.$(O) JavaCodeLibrary.$(H): JavaCodeLibrary.st $(INCLUDE_TOP)/stx/libjava/JavaCodeLibraryOrBundle.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)JavaEmbeddedFrameView.$(O) JavaEmbeddedFrameView.$(H): JavaEmbeddedFrameView.st $(INCLUDE_TOP)/stx/libjava/JavaView.$(H) $(INCLUDE_TOP)/stx/libview/View.$(H) $(INCLUDE_TOP)/stx/libview/SimpleView.$(H) $(INCLUDE_TOP)/stx/libview/DisplaySurface.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsMedium.$(H) $(INCLUDE_TOP)/stx/libview/DeviceGraphicsContext.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsContext.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)JavaFieldAnnotationContainer.$(O) JavaFieldAnnotationContainer.$(H): JavaFieldAnnotationContainer.st $(INCLUDE_TOP)/stx/libjava/JavaAnnotationContainer.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)JavaFieldDescriptor.$(O) JavaFieldDescriptor.$(H): JavaFieldDescriptor.st $(INCLUDE_TOP)/stx/libjava/JavaDescriptor.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
--- a/Make.spec Sat Jan 12 16:42:57 2013 +0000
+++ b/Make.spec Tue Jan 15 18:40:37 2013 +0000
@@ -167,9 +167,6 @@
JavaPathElement \
JavaMirror \
JavaClassQuery \
- JavaCodeLibraryOrBundle \
- JavaCodeBundle \
- JavaCodeLibrary \
@@ -292,9 +289,6 @@
$(OUTDIR)JavaPathElement.$(O) \
$(OUTDIR)JavaMirror.$(O) \
$(OUTDIR)JavaClassQuery.$(O) \
- $(OUTDIR)JavaCodeLibraryOrBundle.$(O) \
- $(OUTDIR)JavaCodeBundle.$(O) \
- $(OUTDIR)JavaCodeLibrary.$(O) \
$(OUTDIR)extensions.$(O) \
--- a/abbrev.stc Sat Jan 12 16:42:57 2013 +0000
+++ b/abbrev.stc Tue Jan 15 18:40:37 2013 +0000
@@ -145,6 +145,3 @@
JavaLookupResolutionAlgorithmTests JavaLookupResolutionAlgorithmTests stx:libjava 'Languages-Java-Tests-Interop' 1
JavaLookupTests JavaLookupTests stx:libjava 'Languages-Java-Tests-Interop' 1
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
-JavaCodeLibrary JavaCodeLibrary stx:libjava 'Languages-Java-Support-Libraries' 0
--- a/bc.mak Sat Jan 12 16:42:57 2013 +0000
+++ b/bc.mak Tue Jan 15 18:40:37 2013 +0000
@@ -114,7 +114,6 @@
$(OUTDIR)JavaClassQuery.$(O) JavaClassQuery.$(H): JavaClassQuery.st $(INCLUDE_TOP)\stx\libbasic\Query.$(H) $(INCLUDE_TOP)\stx\libbasic\Notification.$(H) $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)JavaClassRegistry.$(O) JavaClassRegistry.$(H): JavaClassRegistry.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)JavaClassReloader.$(O) JavaClassReloader.$(H): JavaClassReloader.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)JavaCodeLibraryOrBundle.$(O) JavaCodeLibraryOrBundle.$(H): JavaCodeLibraryOrBundle.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)JavaCompiler_Eclipse.$(O) JavaCompiler_Eclipse.$(H): JavaCompiler_Eclipse.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)JavaConstantPool.$(O) JavaConstantPool.$(H): JavaConstantPool.st $(INCLUDE_TOP)\stx\libbasic\Array.$(H) $(INCLUDE_TOP)\stx\libbasic\ArrayedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\SequenceableCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)JavaConstants.$(O) JavaConstants.$(H): JavaConstants.st $(INCLUDE_TOP)\stx\libbasic\SharedPool.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
@@ -179,8 +178,6 @@
$(OUTDIR)JavaClassContentRef2.$(O) JavaClassContentRef2.$(H): JavaClassContentRef2.st $(INCLUDE_TOP)\stx\libjava\JavaRef2.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)JavaClassReader.$(O) JavaClassReader.$(H): JavaClassReader.st $(INCLUDE_TOP)\stx\libjava\JavaConstants.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)JavaClassRef2.$(O) JavaClassRef2.$(H): JavaClassRef2.st $(INCLUDE_TOP)\stx\libjava\JavaRef2.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)JavaCodeBundle.$(O) JavaCodeBundle.$(H): JavaCodeBundle.st $(INCLUDE_TOP)\stx\libjava\JavaCodeLibraryOrBundle.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)JavaCodeLibrary.$(O) JavaCodeLibrary.$(H): JavaCodeLibrary.st $(INCLUDE_TOP)\stx\libjava\JavaCodeLibraryOrBundle.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)JavaEmbeddedFrameView.$(O) JavaEmbeddedFrameView.$(H): JavaEmbeddedFrameView.st $(INCLUDE_TOP)\stx\libjava\JavaView.$(H) $(INCLUDE_TOP)\stx\libview\View.$(H) $(INCLUDE_TOP)\stx\libview\SimpleView.$(H) $(INCLUDE_TOP)\stx\libview\DisplaySurface.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsMedium.$(H) $(INCLUDE_TOP)\stx\libview\DeviceGraphicsContext.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsContext.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)JavaFieldAnnotationContainer.$(O) JavaFieldAnnotationContainer.$(H): JavaFieldAnnotationContainer.st $(INCLUDE_TOP)\stx\libjava\JavaAnnotationContainer.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)JavaFieldDescriptor.$(O) JavaFieldDescriptor.$(H): JavaFieldDescriptor.st $(INCLUDE_TOP)\stx\libjava\JavaDescriptor.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
Binary file java/libs-src/junit-4.8.2-sources.jar has changed
--- a/libInit.cc Sat Jan 12 16:42:57 2013 +0000
+++ b/libInit.cc Tue Jan 15 18:40:37 2013 +0000
@@ -44,7 +44,6 @@
_JavaClassQuery_Init(pass,__pRT__,snd);
_JavaClassRegistry_Init(pass,__pRT__,snd);
_JavaClassReloader_Init(pass,__pRT__,snd);
-_JavaCodeLibraryOrBundle_Init(pass,__pRT__,snd);
_JavaCompiler_137Eclipse_Init(pass,__pRT__,snd);
_JavaConstantPool_Init(pass,__pRT__,snd);
_JavaConstants_Init(pass,__pRT__,snd);
@@ -109,8 +108,6 @@
_JavaClassContentRef2_Init(pass,__pRT__,snd);
_JavaClassReader_Init(pass,__pRT__,snd);
_JavaClassRef2_Init(pass,__pRT__,snd);
-_JavaCodeBundle_Init(pass,__pRT__,snd);
-_JavaCodeLibrary_Init(pass,__pRT__,snd);
_JavaEmbeddedFrameView_Init(pass,__pRT__,snd);
_JavaFieldAnnotationContainer_Init(pass,__pRT__,snd);
_JavaFieldDescriptor_Init(pass,__pRT__,snd);
--- a/libjava.rc Sat Jan 12 16:42:57 2013 +0000
+++ b/libjava.rc Tue Jan 15 18:40:37 2013 +0000
@@ -25,7 +25,7 @@
VALUE "LegalCopyright", "Copyright Claus Gittinger 1988-2011\nCopyright eXept Software AG 1998-2011\nCopyright Jan Vrany, Jan Kurs and Marcel Hlopko\n SWING Research Group, Czech Technical University In Prague\0"
VALUE "ProductName", "Smalltalk/X\0"
VALUE "ProductVersion", "6.2.3.0\0"
- VALUE "ProductDate", "Sat, 12 Jan 2013 16:42:02 GMT\0"
+ VALUE "ProductDate", "Wed, 09 Jan 2013 17:41:11 GMT\0"
END
END
--- a/libs/java/pom.xml Sat Jan 12 16:42:57 2013 +0000
+++ b/libs/java/pom.xml Tue Jan 15 18:40:37 2013 +0000
@@ -57,11 +57,13 @@
<version>3.3.1</version>
</dependency>
+ <!--
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.8.2</version>
- </dependency>
+ </dependency>
+ -->
<dependency>
<groupId>org.apache.poi</groupId>
--- a/stx_libjava.st Sat Jan 12 16:42:57 2013 +0000
+++ b/stx_libjava.st Tue Jan 15 18:40:37 2013 +0000
@@ -412,12 +412,7 @@
(JavaLookupResolutionAlgorithmTests autoload)
(JavaLookupTests autoload)
(JavaLookupTestsResource autoload)
- JavaCodeLibraryOrBundle
- JavaCodeBundle
- JavaCodeLibrary
)
-
- "Modified: / 12-01-2013 / 16:39:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
extensionMethodNames