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 to make tomcat work for mh jk_new_structure
authorhlopkmar
Tue, 13 Dec 2011 13:57:07 +0000
branchjk_new_structure
changeset 1275 8cad19554d21
parent 1274 6767d2f1d29d
child 1276 5a302466ecb8
fixes to make tomcat work for mh
src/JavaResolver.st file | annotate | diff | comparison | revisions
src/JavaUtilities.st file | annotate | diff | comparison | revisions
src/JavaVM.st file | annotate | diff | comparison | revisions
src/Make.proto file | annotate | diff | comparison | revisions
src/Make.spec file | annotate | diff | comparison | revisions
src/bc.mak file | annotate | diff | comparison | revisions
src/libjava.rc file | annotate | diff | comparison | revisions
src/stx_libjava.st file | annotate | diff | comparison | revisions 
--- a/src/JavaResolver.st	Tue Dec 13 12:26:16 2011 +0000
+++ b/src/JavaResolver.st	Tue Dec 13 13:57:07 2011 +0000
@@ -191,8 +191,10 @@
      Each such class or interface belongs to a single runtime package. The runtime
      package of a class or interface is determined by the package name and
      defining class loader of the class or interface."
-    
-    (JavaDescriptor isJavaPrimitiveArrayName: resolvedClass javaName) ifTrue: [ ^ true ].
+    ^true.
+    (JavaDescriptor isJavaPrimitiveArrayName: resolvedClass javaName) ifTrue: [
+        ^ true
+    ].
     resolvedClass isPublic ifTrue: [ ^ true ].
     resolvedClass classLoader = refOwner classLoader ifFalse: [ ^ false. ].
     refOwner javaPackage = resolvedClass javaPackage ifTrue: [ ^ true ].
@@ -204,7 +206,7 @@
     "Created: / 11-04-2011 / 19:35:21 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
     "Modified (format): / 09-10-2011 / 17:27:30 / m"
     "Modified (comment): / 09-10-2011 / 23:11:54 / Marcel Hlopko <hlopik@gmail.com>"
-    "Modified: / 06-12-2011 / 16:41:03 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+    "Modified: / 13-12-2011 / 14:34:48 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 !
 
 loadUnresolvedClass: aJavaClassRef 
--- a/src/JavaUtilities.st	Tue Dec 13 12:26:16 2011 +0000
+++ b/src/JavaUtilities.st	Tue Dec 13 13:57:07 2011 +0000
@@ -72,17 +72,21 @@
 !JavaUtilities::Tomcat methodsFor:'accessing - paths'!
 
 catalinaHome
-
     "Bit hacky, but..."
-
-    OperatingSystem getLoginName = 'jv' ifTrue:[
-        ^'/home/jv/Projects/libjava/sources/libjava/branches/jk_new_structure/src/examples/tomcat/apache-tomcat-6.0.35-src/output/build'
+    
+    OperatingSystem getLoginName = 'jv' ifTrue: [
+        ^ '/home/jv/Projects/libjava/sources/libjava/branches/jk_new_structure/src/examples/tomcat/apache-tomcat-6.0.35-src/output/build'
     ].
-    "Add your default here"
-
-    ^((Smalltalk at:#stx_libjava) packageDirectory / 'examples' / 'tomcat' / 'apache-tomcat-6.0.35-src' / 'output' / 'build') pathName
+    OperatingSystem getLoginName = 'm' ifTrue: [
+        ^ '/home/m/Projects/libjava/branches/jk_new_structure/src/examples/tomcat/apache-tomcat-6.0.35-src/output/build'
+        ].
+     "Add your default here"
+    ^ ((Smalltalk at: #'stx_libjava') packageDirectory / 'examples' / 'tomcat' 
+        / 'apache-tomcat-6.0.35-src' / 'output' 
+        / 'build') pathName
 
     "Created: / 08-12-2011 / 22:17:45 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 13-12-2011 / 14:32:49 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 !
 
 classPath1
@@ -100,10 +104,13 @@
 !
 
 sourcePath
-
-    ^'/home/jv/Projects/libjava/sources/libjava/branches/jk_new_structure/src/examples/tomcat/apache-tomcat-6.0.35-src/java'
+OperatingSystem getLoginName = 'm' ifTrue: [
+^ '/home/m/Projects/libjava/branches/jk_new_structure/src/examples/tomcat/apache-tomcat-6.0.35-src/java'
+    ].
+    ^ '/home/jv/Projects/libjava/sources/libjava/branches/jk_new_structure/src/examples/tomcat/apache-tomcat-6.0.35-src/java'
 
     "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>"
 ! !
 
 !JavaUtilities::Tomcat methodsFor:'initialization'!
--- a/src/JavaVM.st	Tue Dec 13 12:26:16 2011 +0000
+++ b/src/JavaVM.st	Tue Dec 13 13:57:07 2011 +0000
@@ -14990,7 +14990,7 @@
     <javanative: 'sun/management/VMManagementImpl' name: 'initOptionalSupportFields()V'>
     | cls |
     cls := nativeContext receiver.
-    self breakPoint:#mh.
+
     cls instVarNamed: #compTimeMonitoringSupport put: 0.
     cls instVarNamed: #threadContentionMonitoringSupport put: 0.
     cls instVarNamed: #currentThreadCpuTimeSupport put: 0.
@@ -15000,7 +15000,7 @@
     cls instVarNamed: #objectMonitorUsageSupport put: 0.
     ^ self.
 
-    "Modified: / 03-11-2011 / 19:29:37 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+    "Modified: / 13-12-2011 / 14:35:03 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 !
 
 _sun_management_VMManagementImpl_isThreadCpuTimeEnabled: nativeContext
--- a/src/Make.proto	Tue Dec 13 12:26:16 2011 +0000
+++ b/src/Make.proto	Tue Dec 13 13:57:07 2011 +0000
@@ -1,7 +1,7 @@
 # $Header$
 #
 # DO NOT EDIT
-# automagically generated from the projectDefinition: stx_libjava at 2011-12-12 18:14:23.213.
+# automagically generated from the projectDefinition: stx_libjava at 2011-12-13 14:57:12.031.
 #
 # Warning: once you modify this file, do not rerun
 # stmkmp or projectDefinition-build again - otherwise, your changes are lost.
@@ -212,7 +212,7 @@
 $(OUTDIR)JavaMethodDeclaratorNode.$(O) JavaMethodDeclaratorNode.$(H): JavaMethodDeclaratorNode.st $(INCLUDE_TOP)/stx/libjava/JavaNode.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)JavaMethodDescriptor.$(O) JavaMethodDescriptor.$(H): JavaMethodDescriptor.st $(INCLUDE_TOP)/stx/libjava/JavaDescriptor.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)JavaMethodNode.$(O) JavaMethodNode.$(H): JavaMethodNode.st $(INCLUDE_TOP)/stx/libjava/JavaNode.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)JavaParser.$(O) JavaParser.$(H): JavaParser.st $(INCLUDE_TOP)/squeak/petitparser/PPCompositeParser.$(H) $(INCLUDE_TOP)/squeak/petitparser/PPDelegateParser.$(H) $(INCLUDE_TOP)/squeak/petitparser/PPParser.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libjava/PPJavaNode.$(H) $(INCLUDE_TOP)/stx/libbasic/ReadStream.$(H) $(INCLUDE_TOP)/stx/libbasic/PositionableStream.$(H) $(INCLUDE_TOP)/stx/libbasic/PeekableStream.$(H) $(INCLUDE_TOP)/stx/libbasic/Stream.$(H) $(STCHDR)
+$(OUTDIR)JavaParser.$(O) JavaParser.$(H): JavaParser.st $(INCLUDE_TOP)/squeak/petitparser/PPCompositeParser.$(H) $(INCLUDE_TOP)/squeak/petitparser/PPDelegateParser.$(H) $(INCLUDE_TOP)/squeak/petitparser/PPParser.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/ReadStream.$(H) $(INCLUDE_TOP)/stx/libbasic/PositionableStream.$(H) $(INCLUDE_TOP)/stx/libbasic/PeekableStream.$(H) $(INCLUDE_TOP)/stx/libbasic/Stream.$(H) $(INCLUDE_TOP)/stx/libjava/PPJavaNode.$(H) $(STCHDR)
 $(OUTDIR)JavaStringRef2.$(O) JavaStringRef2.$(H): JavaStringRef2.st $(INCLUDE_TOP)/stx/libjava/JavaRef2.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)JavaTypeNode.$(O) JavaTypeNode.$(H): JavaTypeNode.st $(INCLUDE_TOP)/stx/libjava/JavaNode.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)JavaUnhandledExceptionError.$(O) JavaUnhandledExceptionError.$(H): JavaUnhandledExceptionError.st $(INCLUDE_TOP)/stx/libjava/JavaError.$(H) $(INCLUDE_TOP)/stx/libbasic/Error.$(H) $(INCLUDE_TOP)/stx/libbasic/Exception.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
--- a/src/Make.spec	Tue Dec 13 12:26:16 2011 +0000
+++ b/src/Make.spec	Tue Dec 13 13:57:07 2011 +0000
@@ -1,7 +1,7 @@
 # $Header$
 #
 # DO NOT EDIT
-# automagically generated from the projectDefinition: stx_libjava at 2011-12-12 18:14:22.142.
+# automagically generated from the projectDefinition: stx_libjava at 2011-12-13 14:57:11.342.
 #
 # Warning: once you modify this file, do not rerun
 # stmkmp or projectDefinition-build again - otherwise, your changes are lost.
--- a/src/bc.mak	Tue Dec 13 12:26:16 2011 +0000
+++ b/src/bc.mak	Tue Dec 13 13:57:07 2011 +0000
@@ -1,7 +1,7 @@
 # $Header$
 #
 # DO NOT EDIT
-# automagically generated from the projectDefinition: stx_libjava at 2011-12-12 18:14:23.774.
+# automagically generated from the projectDefinition: stx_libjava at 2011-12-13 14:57:12.393.
 #
 # Warning: once you modify this file, do not rerun
 # stmkmp or projectDefinition-build again - otherwise, your changes are lost.
@@ -167,7 +167,7 @@
 $(OUTDIR)JavaMethodDeclaratorNode.$(O) JavaMethodDeclaratorNode.$(H): JavaMethodDeclaratorNode.st $(INCLUDE_TOP)\stx\libjava\JavaNode.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)JavaMethodDescriptor.$(O) JavaMethodDescriptor.$(H): JavaMethodDescriptor.st $(INCLUDE_TOP)\stx\libjava\JavaDescriptor.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)JavaMethodNode.$(O) JavaMethodNode.$(H): JavaMethodNode.st $(INCLUDE_TOP)\stx\libjava\JavaNode.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)JavaParser.$(O) JavaParser.$(H): JavaParser.st $(INCLUDE_TOP)\squeak\petitparser\PPCompositeParser.$(H) $(INCLUDE_TOP)\squeak\petitparser\PPDelegateParser.$(H) $(INCLUDE_TOP)\squeak\petitparser\PPParser.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libjava\PPJavaNode.$(H) $(INCLUDE_TOP)\stx\libbasic\ReadStream.$(H) $(INCLUDE_TOP)\stx\libbasic\PositionableStream.$(H) $(INCLUDE_TOP)\stx\libbasic\PeekableStream.$(H) $(INCLUDE_TOP)\stx\libbasic\Stream.$(H) $(STCHDR)
+$(OUTDIR)JavaParser.$(O) JavaParser.$(H): JavaParser.st $(INCLUDE_TOP)\squeak\petitparser\PPCompositeParser.$(H) $(INCLUDE_TOP)\squeak\petitparser\PPDelegateParser.$(H) $(INCLUDE_TOP)\squeak\petitparser\PPParser.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\ReadStream.$(H) $(INCLUDE_TOP)\stx\libbasic\PositionableStream.$(H) $(INCLUDE_TOP)\stx\libbasic\PeekableStream.$(H) $(INCLUDE_TOP)\stx\libbasic\Stream.$(H) $(INCLUDE_TOP)\stx\libjava\PPJavaNode.$(H) $(STCHDR)
 $(OUTDIR)JavaStringRef2.$(O) JavaStringRef2.$(H): JavaStringRef2.st $(INCLUDE_TOP)\stx\libjava\JavaRef2.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)JavaTypeNode.$(O) JavaTypeNode.$(H): JavaTypeNode.st $(INCLUDE_TOP)\stx\libjava\JavaNode.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)JavaUnhandledExceptionError.$(O) JavaUnhandledExceptionError.$(H): JavaUnhandledExceptionError.st $(INCLUDE_TOP)\stx\libjava\JavaError.$(H) $(INCLUDE_TOP)\stx\libbasic\Error.$(H) $(INCLUDE_TOP)\stx\libbasic\Exception.$(H) $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
--- a/src/libjava.rc	Tue Dec 13 12:26:16 2011 +0000
+++ b/src/libjava.rc	Tue Dec 13 13:57:07 2011 +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\b          SWING Research Group, Czech Technical University In Prague\0"
       VALUE "ProductName", "Smalltalk/X\0"
       VALUE "ProductVersion", "6.2.1.1\0"
-      VALUE "ProductDate", "Mon, 12 Dec 2011 17:14:30 GMT\0"
+      VALUE "ProductDate", "Tue, 13 Dec 2011 13:57:19 GMT\0"
     END
 
   END
--- a/src/stx_libjava.st	Tue Dec 13 12:26:16 2011 +0000
+++ b/src/stx_libjava.st	Tue Dec 13 13:57:07 2011 +0000
@@ -162,18 +162,18 @@
      exclude individual packages in the #excludedFromPrerequisites method."
 
     ^ #(
-        #'squeak:petitparser'    "PPParser - superclass of JavaParser::MultilineCommentParser "
-        #'stx:goodies/sunit'    "TestSuite - referenced by stx_libjava class>>testSuite "
-        #'stx:libbasic'    "Dictionary - superclass of JavaAnnotationDictionary "
+        #'squeak:petitparser'    "PPParser - superclass of JavaParser::LineNumberParser "
+        #'stx:goodies/sunit'    "TestAsserter - superclass of JavaAntProjectResource "
+        #'stx:libbasic'    "PeekableStream - superclass of JavaSocket "
         #'stx:libbasic2'    "Socket - superclass of JavaSocket "
         #'stx:libbasic3'    "WrappedMethod - extended "
         #'stx:libcomp'    "ObjectFileLoader - referenced by JavaVM class>>_Runtime_loadFileInternalI: "
         #'stx:libhtml'    "URL - referenced by JavaEmbeddedFrameView>>setupAppletFrameIn:initializeJava: "
-        #'stx:libtool'    "WorkspaceApplication - referenced by JavaEvaluator>>evaluate:in:receiver:notifying:logged:ifFail: "
-        #'stx:libview'    "DeviceGraphicsContext - superclass of JavaPopUpView "
+        #'stx:libtool'    "DebugView - referenced by Java class>>flushClasses "
+        #'stx:libview'    "SimpleView - superclass of JavaTopView "
         #'stx:libview2'    "GIFReader - referenced by JavaVM class>>_GifImageDecoder_parseImage: "
-        #'stx:libwidg'    "EditField - referenced by JavaVM class>>_WTextFieldPeer_create: "
-        #'stx:libwidg2'    "MenuPanel - referenced by JavaVM class>>processEvent: "
+        #'stx:libwidg'    "FileSelectionBox - referenced by Java class>>javaProcessForMainOf:argumentString: "
+        #'stx:libwidg2'    "ComboBoxView - referenced by JavaVM class>>processEvent: "
     )
 ! !
 
@@ -399,6 +399,7 @@
         JavaMethodWithHandler
         JavaNativeMethod
         JavaUtilities
+        JavaFieldDescriptorWithUnionType
     )
 !
 
@@ -530,6 +531,8 @@
         'BooleanArray class' javaArrayClass
         'DoubleArray class' javaArrayClass
         'FloatArray class' javaArrayClass
+        Object javaUnwrap:
+        'Boolean class' javaUnwrap:
     )
 ! !
 
@@ -582,7 +585,7 @@
     "Return a SVN revision number of myself.
      This number is updated after a commit"
 
-    ^ "$SVN-Revision:"        '1609M'"$"
+    ^ "$SVN-Revision:"        '1623M'"$"
 ! !
 
 !stx_libjava class methodsFor:'file generation'!
hg/stx-libjava