Menu
▾
▴
openorb-commits — A moderate volume list to track updates to the CVS repository.
You can subscribe to this list here.
| 2002 |
Jan
(887) |
Feb
(1041) |
Mar
(429) |
Apr
(147) |
May
(358) |
Jun
(378) |
Jul
(484) |
Aug
(501) |
Sep
(259) |
Oct
(934) |
Nov
(235) |
Dec
(108) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(287) |
Feb
(571) |
Mar
(939) |
Apr
(282) |
May
(71) |
Jun
(4) |
Jul
|
Aug
(10) |
Sep
|
Oct
(121) |
Nov
(141) |
Dec
(32) |
| 2004 |
Jan
(119) |
Feb
(697) |
Mar
(12) |
Apr
(23) |
May
(34) |
Jun
(44) |
Jul
(270) |
Aug
(62) |
Sep
(4) |
Oct
(2) |
Nov
(35) |
Dec
(18) |
| 2005 |
Jan
(37) |
Feb
(7) |
Mar
(49) |
Apr
(1) |
May
(6) |
Jun
|
Jul
(3) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(2) |
Nov
|
Dec
|
| 2007 |
Jan
(1) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
(2) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Michael R. <mr...@us...> - 2004-07-29 09:48:24
|
Update of /cvsroot/openorb/PropertyService In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3813/PropertyService Modified Files: WHATSNEW Log Message: Added release tags to the WHATSNEW files Index: WHATSNEW =================================================================== RCS file: /cvsroot/openorb/PropertyService/WHATSNEW,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- WHATSNEW 10 Feb 2004 20:06:08 -0000 1.23 +++ WHATSNEW 29 Jul 2004 09:48:12 -0000 1.24 @@ -1,14 +1,16 @@ OpenORB PropertyService ----------------------- -- upgraded to checkstyle 3.3 +Version 1.4.0 BETA2 - July, 29 2004 - PropertyService_1_4_0_BETA2 + +- Upgraded to checkstyle 3.3. - Fixed various warnings Eclipse 3.0M6 complained about. - + - Added Eclipse project files (.project and .classpath) the project can now easily be imported by New->Project->Import From existing Source - + - Placed compiler cache files in build directory, caches are now deleted by invoking the build target "clean" |
|
From: Michael R. <mr...@us...> - 2004-07-29 09:48:24
|
Update of /cvsroot/openorb/PersistentStateService In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3813/PersistentStateService Modified Files: WHATSNEW Log Message: Added release tags to the WHATSNEW files Index: WHATSNEW =================================================================== RCS file: /cvsroot/openorb/PersistentStateService/WHATSNEW,v retrieving revision 1.38 retrieving revision 1.39 diff -u -d -r1.38 -r1.39 --- WHATSNEW 27 Jul 2004 09:16:29 -0000 1.38 +++ WHATSNEW 29 Jul 2004 09:48:12 -0000 1.39 @@ -1,6 +1,8 @@ OpenORB PersistentStateService ------------------------------ +Version 1.4.0 BETA2 - July, 29 2004 - PersistentStateService_1_4_0_BETA2 + - Fixed examples: org.openorb.pss.examples. memory.basic|transactional.* file.basic|transactional.* |
|
From: Michael R. <mr...@us...> - 2004-07-29 09:48:23
|
Update of /cvsroot/openorb/NotificationService In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3813/NotificationService Modified Files: WHATSNEW Log Message: Added release tags to the WHATSNEW files Index: WHATSNEW =================================================================== RCS file: /cvsroot/openorb/NotificationService/WHATSNEW,v retrieving revision 1.64 retrieving revision 1.65 diff -u -d -r1.64 -r1.65 --- WHATSNEW 23 Jul 2004 15:24:00 -0000 1.64 +++ WHATSNEW 29 Jul 2004 09:48:12 -0000 1.65 @@ -1,6 +1,8 @@ OpenORB NotificationService --------------------------- +Version 1.4.0 BETA2 - July, 29 2004 - NotificationService_1_4_0_BETA2 + - Added a test case for bug #524478. The exception does not seem to occur anymore. @@ -14,7 +16,7 @@ - incorporated partial patches from Richard G. Hash to get subscription_change() to work for push events -- upgraded to checkstyle 3.3 +- Upgraded to checkstyle 3.3. - Fixed various warnings Eclipse 3.0M6 complained about. |
|
From: Michael R. <mr...@us...> - 2004-07-29 09:48:23
|
Update of /cvsroot/openorb/TimeService In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3813/TimeService Modified Files: WHATSNEW Log Message: Added release tags to the WHATSNEW files Index: WHATSNEW =================================================================== RCS file: /cvsroot/openorb/TimeService/WHATSNEW,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- WHATSNEW 27 Mar 2004 22:37:27 -0000 1.23 +++ WHATSNEW 29 Jul 2004 09:48:13 -0000 1.24 @@ -1,13 +1,15 @@ OpenORB TimeService ------------------- +Version 1.4.0 BETA2 - July, 29 2004 - TimeService_1_4_0_BETA2 + - Corrected the wrong implementation of UTC time. The value in a UtcT shall use the time base at 15 October 1582 00:00:00 GMT at a precision of 100 nanoseconds. The old implementation used the Java Date, which has time base 1 January 1970 00:00:00 and a precision of milliseconds. Also updated the spec version to Time Service Spec 1.1 (formal/02-05-06). -- upgraded to checkstyle 3.3 +- Upgraded to checkstyle 3.3. - Fixed various warnings Eclipse 3.0M6 complained about. |
|
From: Michael R. <mr...@us...> - 2004-07-29 09:48:23
|
Update of /cvsroot/openorb/NamingService In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3813/NamingService Modified Files: WHATSNEW Log Message: Added release tags to the WHATSNEW files Index: WHATSNEW =================================================================== RCS file: /cvsroot/openorb/NamingService/WHATSNEW,v retrieving revision 1.38 retrieving revision 1.39 diff -u -d -r1.38 -r1.39 --- WHATSNEW 10 Feb 2004 19:41:39 -0000 1.38 +++ WHATSNEW 29 Jul 2004 09:48:12 -0000 1.39 @@ -1,14 +1,16 @@ OpenORB NamingService --------------------- -- upgraded to checkstyle 3.3 +Version 1.4.0 BETA2 - July, 29 2004 - NamingService_1_4_0_BETA2 + +- Upgraded to checkstyle 3.3. - Fixed various warnings Eclipse 3.0M6 complained about. - + - Added Eclipse project files (.project and .classpath) the project can now easily be imported by New->Project->Import From existing Source - + - Added a fix for the JNDI context factory to use the fallback if all other ways fail. |
|
From: Michael R. <mr...@us...> - 2004-07-29 09:48:21
|
Update of /cvsroot/openorb/ManagementBoard In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3813/ManagementBoard Modified Files: WHATSNEW Log Message: Added release tags to the WHATSNEW files Index: WHATSNEW =================================================================== RCS file: /cvsroot/openorb/ManagementBoard/WHATSNEW,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- WHATSNEW 10 Feb 2004 19:40:37 -0000 1.28 +++ WHATSNEW 29 Jul 2004 09:48:12 -0000 1.29 @@ -1,14 +1,16 @@ OpenORB ManagementBoard ----------------------- -- upgraded to checkstyle 3.3 +Version 1.4.0 BETA2 - July, 29 2004 - ManagementBoard_1_4_0_BETA2 + +- Upgraded to checkstyle 3.3. - Fixed various warnings Eclipse 3.0M6 complained about. - + - Added Eclipse project files (.project and .classpath) the project can now easily be imported by New->Project->Import From existing Source - + Version 1.4.0 BETA1 - December, 19 2003 - ManagementBoard_1_4_0_BETA1 - Removed the setConfig scripts, use the updateConfig scripts |
|
From: Michael R. <mr...@us...> - 2004-07-29 09:48:21
|
Update of /cvsroot/openorb/InterfaceRepository In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3813/InterfaceRepository Modified Files: WHATSNEW Log Message: Added release tags to the WHATSNEW files Index: WHATSNEW =================================================================== RCS file: /cvsroot/openorb/InterfaceRepository/WHATSNEW,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- WHATSNEW 21 Jul 2004 11:18:05 -0000 1.30 +++ WHATSNEW 29 Jul 2004 09:48:11 -0000 1.31 @@ -1,6 +1,8 @@ OpenORB InterfaceRepository --------------------------- +Version 1.4.0 BETA2 - July, 29 2004 - InterfaceRepository_1_4_0_BETA2 + - Fixed bug #800327 (FullInterfaceDescription: no transient hull). - Fixed the idl2ir script which now passes the openorb.home.path |
|
From: Michael R. <mr...@us...> - 2004-07-29 09:43:32
|
Update of /cvsroot/openorb/admin/release In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3150/admin/release Modified Files: RELEASE_NOTES_1_4_0_BETA2.txt Log Message: The final release notes version Index: RELEASE_NOTES_1_4_0_BETA2.txt =================================================================== RCS file: /cvsroot/openorb/admin/release/RELEASE_NOTES_1_4_0_BETA2.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- RELEASE_NOTES_1_4_0_BETA2.txt 29 Jul 2004 09:36:47 -0000 1.1 +++ RELEASE_NOTES_1_4_0_BETA2.txt 29 Jul 2004 09:43:24 -0000 1.2 @@ -15,11 +15,11 @@ Changes: ======== -The following list shows the changes since the first beta -release only. -The complete list of changes per package is available in the +The following list shows the changes since the first beta release +only. The complete list of changes per package is available in the WHATSNEW file included with each module. + General: -------- - Fixed various warnings Eclipse 3.0M6 complained about. @@ -328,6 +328,7 @@ Bug Reporting: +============== Please report any problem you find to the SourceForge mailing list ope...@li.... When the problem is identified as a bug |
|
From: Michael R. <mr...@us...> - 2004-07-29 09:36:56
|
Update of /cvsroot/openorb/admin/release In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2408 Added Files: RELEASE_NOTES_1_4_0_BETA2.txt Log Message: Added the BETA2 release notes --- NEW FILE: RELEASE_NOTES_1_4_0_BETA2.txt --- The Community OpenORB 1.4.0 BETA2 is out. After nearly 8 months of testing and bug-fixing, the OpenORB community is proud to release the second beta of "The Community OpenORB" product suite version 1.4. The archives of all packages can be found at the SF project download area: http://sourceforge.net/project/showfiles.php?group_id=43608 Have fun, The Community OpenORB Team Changes: ======== The following list shows the changes since the first beta release only. The complete list of changes per package is available in the WHATSNEW file included with each module. General: -------- - Fixed various warnings Eclipse 3.0M6 complained about. - Added Eclipse project files (.project and .classpath) the project can now easily be imported by New->Project->Import From existing Source - Placed compiler cache files in build directory, caches are now deleted by invoking the build target "clean" OpenORB: -------- - Fixed bug #955143. The problem of marshaling the array type org.omg.CORBA.Any[] was due to a different behaviour of the parser in the simple case (org.omg.CORBA.Any) and the array type. This problem only appeared when org.omg.CORBA.Any has not been parsed before. But our test case RemoteComplex has another method that just uses the type org.omg.CORBA.Any so that this bug never showed up under UNIX. Only Windows uncovered the problem but it is still not known what the difference between the Windows VM and the UNIX VMs was. - Always use the native library on AIX with VM 1.4.x. - When setting the property UtilDelegateImpl.setLocalCodebaseOnly(true) we don't want any RMIClassloader to attempt to load the class. In normal projects client and server side contain the classes that are necessary for marshaling/unmarshaling the transfered types. I have never seen a project where classes are loaded dynamically from a remote location. Though the UtilDelegateImpl wastes a lot of time trying to load a class using the RMIClassloader. The reason is simply standard compliance because the Java2IDL spec. requires exactly this behaviour. The default behaviour of the method UtilDelegateImpl.loadClass() is the standard compliant. With the property mentioned above the costly class loader operations can be skipped. - Added an optimization to ORB.lookup_value_factory(). This method always perfoms expensive lookups although it should never be used for any RMI type. - Wrapped an unmarshalling call into a PriviledgedAction to make it work even in restricted environments. - Started adding a time measurement wrapper around test cases to be able to detect hanging or long running test cases. - Added missing class org.omg.CORBA.ObjectHelper to src/omg to make OpenORB compile under IBM JDK 1.4.2 as this class seems to be missing from IBM's server.jar in 1.4.2 whereas it was still present in version 1.4.1. - Fixed boolean property parsing for the iiop.useNativeLibrary. OpenORB's getBooleanProperty assumes each value not equal to 'false' or 'no' as true, so when Ant is passing a property like this: iiop.useNativeLibrary=${useNativeLibrary} because the property has not been set OpenORB evaluates the property to true and wants to load the native library later in the tests. - Added a Codec test case to verify a problem reported by Mathieu Vadet (mathieu _dot_ vadet _at_ fr _dot_ thalesgroup _dot_ com). - Fixed a bunch of checkstyle violations. - Added read/write_vale/abstract_interface to LocalInput/OutputStream classes. This fixes a NO_IMPLEMENT exception reported by Sumedh Mungee (sumedh _at_ nms _dot_ fnc _dot_ fujitsu _dot_ com). - In rare instances a thread deadlock can occur between "org.openorb.orb.io.BufferSource.setException()" and "org.openorb.orb.iiop.IIOPClientRequest.lastReplyMessage()". What happens is that "IIOPClientRequest.cancel()" (holding the 'm_sync_state' lock) is called at the same time as "BufferSource.next()" (holding the 'BufferSource' lock) generates a firing of the attached 'LastMessageProcessedListener', calling "IIOPClientRequest.lastReplyMessage()", which needs the 'm_sync_state' lock. The solution I've come up with is to make the "BufferSource.next()" method release the 'BufferSource' thread lock before calling the attached 'LastMessageProcessedListener'. As part of this, I've moved the functionality of the 'BufferSource.lastMessageProcessed()' method into "BufferSource.next()". This fix was contributed by Eric Thomas (e _dot_ thomas _at_ isti _dot_ com). - Fixed a sporadic NPE in Delegate.java. - Added fix for bug #968135 contributed by Dave Raymer (raymerd _at_ users _dot_ sf _dot_ net). - Improved documentation for idl2java Ant task. - Added flag "no-rmi-test" to the build process so that RMI test can be disabled while the Java2IDL compiler is being fixed. - Improved exception message when the types during a PortableRemoteObject.narrow do not match. - Added a message text to the ClassCastException thrown by the method PortableRemoteObjectDelegateImpl.narrowExt(). - Do not signal an unexpected case when there is no server side ORB available. - Fixed order with which the compilers are initialized. The method execute_compiler shows the copyright header and reads a flag that has not been parsed from the commandline at that time. - If a "LOGGER" is provided in the properties that are passed to ORB.init(args, p), that logger is used to initialize the orb and initializer loggers. In that case, the priority setting in the configuration is basically ignored. - Fixed some problems with the debug input and output streams which would not work under Win32 and were prone to overwriting exisiting logs. - Refactored ConfiguredSocketFactory to use a stream decoration strategy for wrapping socket input and output streams. This framework is more powerful and robust than the functionality previously provided by setting the properties: iiop.SocketOutputStreamClass iiop.SocketInputStreamClass The use of these properties is now deprecated. - Fixed some threading errors including use of double-check locking. - Fixed filename to classname convertion in the Java to IDL compiler to handle '\' path separators in addition to '/' path separators. - Fixed problem in the IDL to Java translator for valuetypes that support interfaces from a different module. - Do not show a warning for an unknown policy value during POA creation because it will be handled later on by a policy factory. - Indicate the pool manager thread to shutdown during ORB shutdown. - Set a name for the ServerManagerImpl's PoolThreadManager thread. - Set a name for the UtilDelegateImpl's ORBDaemon thread. - Improved error messages in IIOPTransport in case of connection failures. Thanks to Richard G. Hash <richard _dot hash _at_ openspirit _dot_ com> for bringing this to our attention. - Fixed an alignment problem in CDROutputStream that occured when marshalling an empty long[], bug #902049. Thanks to Michal Jelen <michal _dot_ jelen _at_ aipsafe _dot_ cz> for investigating this problem. - In ORB.init() methods, added checking Applet parameters for the ORB class name and the orb.properties file from user home. - Fixed a marshaling problem in the RMI-IIOP layer that was causing VM crashes. When marshaling a RemoteException the base classes are RemoteException->IOException->Exception->Throwable. Only RemoteException and Throwable have members that are serialized. The special situation is that Throwable has a writeObject() method but no readObject() method. This leads to a code path in ValuHandlerImpl.readValue() that does not seem to be used before. The code path was calling defaultReadObject( ..., sc ) where sc was the object stream class of RemoteException leading to the behaviour that only the detail member of RemoteException was read from the stream. The stack trace elements, a member of Throwable, was never read. This was leading to a VM crash when the VM tried to access the stack trace of the RemoteException. - Added the patch from tigerf _at_ sf _dot_ net for bug #873558. - Fixed the broken IDL reflection example. - Fixed a StackOverflowError (due to an infinite recursion on initCause) when the ORB class is not found. - In OMG's ORB.init(...) operations, added checking for ORB class properties passed through the props parameters to ORB.init(...). - Added the ORB.destroy() operation as it is defined in the CORBA 2.4 spec (Section 4.2.3.5). - Added the ORB.destroy() implementation along with changes to shutdown() and finalize() in order to check for multiple calls to these methods. - Fixed a NPE in idl2java Ant task when verbose="true", Sourceforge bug ID 881983 - Added a property "openorb.rmi.use_native_library" which can be used for deciding whether the RMI-IIOP engine is using the JDK inherent mechanism or a OpenORB native library as its unmarshaling engine. The native library can be found in the CVS module "native" but it must be compiled for the target platform and put on the library path in order to be found by the System.loadLibrary("openorb") call. There are two reasons for adding such a library: 1. The JDK has a problem on a certain platform with accessing private native methods in JDK internal classes. (That was the case for IBM JDK 1.4.1 on IBM AIX 5.2L where a UnsatisfiedLinkError occured although the native library libjava.a was loaded during VM startup. The problem did not occur on the same JDK under SuSE Linux 9) 2. A new JDK comes out and the developers have changed the internal structure of the unmarshaling engine again so that the pure Java mechanism doesn't work. In this case the library can be compiled for the platform (it might even be already compiled for that platform) and used to make the marshaling work with this new JDK. - Fixed the discoverage of the allocateNewObject method for IBM 1.4.x JDKs. - Fixed a bug in the DeserializationKernelFactory which caused no other kernel than the Sun kernel to be created. - Fixed a bug in the DeserializationKernelIBM class which was causing demarshaling of obejcts to fail. - Added support for IBM JDK 1.4.1 by adding a new class DeserializationKernelIBM14 where the new IBM JDK 1.4.x classes will be used internally. - Fixed the calculator rmi example by adding the right property to instantiate the JNDI context factory. - Fixed a ClassCastException when the ManagementBoard was launched via the launch script. - Added a patch from Alexej Vlasov <lexas _at_ bssys _dot_ com> which fixes a problem with fragmented messages. - Added cachefile attribute to idl2java and java2idl ant tasks to allow the user to control the cachefile location (old behaviour and new default is to use the current directory) Tools: ------ - For IBM JDK 1.4.2 the ibmorbapi.jar must be put on the jdk.runtime.jars property otherwise org.omg.CORBA.SystemException will not be found. - Added HSQLDB jar which substitutes the InstantDB formerly available for OTS only. - Added the native library jar to this module. A native library will currently be extracted for AIX only. - Switch to checkstyle 3.4 (because of fix for bug #895072). - Changed the Copyright year from '2003' to '2002-2004'. - Fixed compilation under IBM JDK because the runtime libraries there are not rt.jar, but core.jar and server.jar. - Fixed the service option: writeIORFile to respect file names instead of folders only. Patch contributed by Richard G. Hash (richard _dot_ hash _at_ openspirit _dot_ com). - Optimized NumberCache and CharacterCache, removing the caching of MIN_VALUE and MAX_VALUE. The cache range is now configurable using system properties, see the javadocs for details. - Added JUnit tests for caching. - Added ConfigUtils class to hold any common config code. - In ServerBase, added more searching for the ORB class according to the spec (e.g., system properties and orb.properties file) in deciding whether the OpenORB ORB shall be used or not. - changed ZipUtil method names CreateZip, OpenZip and CloseZip to lowercase (binary incompatible change) - Added the NamingService JNDI jar to the classpath when running orb examples. - Updated Ant to version 1.6.2 as it seems to work with IBM JDK 1.4.1 without problems. The old 1.5.1 version was causing classloader problems during javac tasks and other strange problems. - Upgraded to checkstyle 3.3. InterfaceRepository: -------------------- - Fixed bug #800327 (FullInterfaceDescription: no transient hull). - Fixed the idl2ir script which now passes the openorb.home.path property as VM parameter to the application. NamingService: -------------- - Added a fix for the JNDI context factory to use the fallback if all other ways fail. NotificationService: -------------------- - Fixed copy+paste error that lead to BAD_OPERATION when extracting long long from an Any. This affected filtering NotificationService Events that contained long longs. (EvaluatorUtility) - Added a test case for bug #524478. The exception does not seem to occur anymore. - improved Pusher log messages. - PushConsumers that continue to fail with SystemException for longer than notify.resourcesTimeout are now disconnected. This way the server can free resources for clients that have terminated without properly disconnecting themselves. Contributed by Eric Thomas. - incorporated partial patches from Richard G. Hash to get subscription_change() to work for push events PersistentStateService: ----------------------- - Fixed examples: org.openorb.pss.examples. memory.basic|transactional.* file.basic|transactional.* database.basic|transactional.* - Fixed copy and paste bugs in examples and added loading of OTS profile so that the transactional examples will work. - Added cachefile attribute to psdl ant task to allow the user to control the cachefile location (old behaviour and new default is to use the current directory) TradingService: --------------- - Fixed copy+paste error that lead to BAD_OPERATION when extracting long long from an Any. This affected filtering NotificationService Events that contained long longs. (EvaluatorUtility) - Applied patch for bug #799051. It was not possible to override a property mode. Contributed by Sylvain Leblanc (sleblanc _at_ users _dot_ sf _dot_ net). - Applied various patches contributed by Richard G. Hash (richard _dot_ hash _at_ openspirit _dot_ com): Changes are to not throw exceptions using the default constructor for exceptions that take string args. If you are running against an orb that doesn't allow null strings to be marshalled these cause BAD_PARAM. Also fixed line 210 of the Lookup.query() method where the tbl.get() wasn't using the correct argument to look up the property(s). This would cause a CosTrading.Property[] array to be created with null contents, causing a CORBA_UNKNOWN on the client side. - Fixed a bug in the service tupe compiler. When not using the keyword mandatory then the PROP_NORMAL was used but a trailing semi-colon was not appended. - Added a test case to verify the previous fix. - Fixed bug #905379 (NPE in withdraw_with_constraint). - Added cachefile attribute to stdl2java ant task to allow the user to control the cachefile location (old behaviour and new default is to use the current directory) TransactionService: ------------------- - Substituted InstantDB by HSQLDB 1.7.2. - Added fix for bug #832259. Connections should be registered as resource only when the transaction is active. Contributed by Alex Andrushchak (alan13 _at_ users _dot_ sf _dot_ net). - Use Avalon loggers instead of static methods in Verbose class. Messages will now go to the logging backend and not to System.out. Errors will always result in Exceptions instead of System.exit() TimeService: ------------ - Corrected the wrong implementation of UTC time. The value in a UtcT shall use the time base at 15 October 1582 00:00:00 GMT at a precision of 100 nanoseconds. The old implementation used the Java Date, which has time base 1 January 1970 00:00:00 and a precision of milliseconds. Also updated the spec version to Time Service Spec 1.1 (formal/02-05-06). Bug Reporting: Please report any problem you find to the SourceForge mailing list ope...@li.... When the problem is identified as a bug it will be filed at the SourceForge bug tracking facilities. |
|
From: Michael R. <mr...@us...> - 2004-07-29 09:36:37
|
Update of /cvsroot/openorb/admin/release In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2362 Modified Files: HOWTO Log Message: Updated release HOWTO Index: HOWTO =================================================================== RCS file: /cvsroot/openorb/admin/release/HOWTO,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- HOWTO 21 Dec 2003 19:20:07 -0000 1.5 +++ HOWTO 29 Jul 2004 09:36:26 -0000 1.6 @@ -1,3 +1,61 @@ +Tags: +===== + + <MDOULE_NAME>_X_Y_Z_{BETAN|RELEASE} + + Version + X: Major + Y: Minor + Z: BugFix + + N: BETA Version Counter + + + +Branches: +========= + + <MODULE_NAME>_X_Y_BRANCH + + Version + X: Major + Y: Minor + + + +Modules: +======== + +The following modules must be tagged. A release must be done for the first +part of the modules only. The modules admin, native, and website must be tagged +only so that the corresponding version can be identified later. + + o ConcurrencyControlService + o EvaluatorUtility + o EventService + o InterfaceRepository + o ManagementBoard + o NamingService + o NotificationService + o OpenORB + o PersistentStateService + o PropertyService + o RMIoverIIOP + o SSL + o TimeService + o TradingService + o TransactionService + o tools + + o admin (no release) + o native (no release) + o website (no release) + + + +Announments: +============ + A new release can be announced on the following sites: - The comp.object.corba Newsgroup |
|
From: Richard G C. <pim...@us...> - 2004-07-29 08:13:15
|
Update of /cvsroot/openorb/tools/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22180/tools/src Modified Files: build.xml Log Message: fixed clean-all target Index: build.xml =================================================================== RCS file: /cvsroot/openorb/tools/src/build.xml,v retrieving revision 1.40 retrieving revision 1.41 diff -u -d -r1.40 -r1.41 --- build.xml 29 Jul 2004 07:30:01 -0000 1.40 +++ build.xml 29 Jul 2004 08:13:06 -0000 1.41 @@ -295,10 +295,9 @@ <delete failonerror="false" quiet="true"> <fileset dir="${lib.dir}"> <include name="${main-jar}" /> - <include name="${main-jar}" /> <include name="${launcher-jar}" /> </fileset> - <fileset dir="{build.dir}" /> + <fileset dir="${build.dir}" /> <fileset dir="${dist.dir}" /> <fileset dir="${dist.doc.dir}" /> <fileset dir="${docbook.dir}" /> |
|
From: Richard G C. <pim...@us...> - 2004-07-29 08:01:12
|
Update of /cvsroot/openorb/OpenORB/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20325/OpenORB/src Modified Files: build.xml Log Message: removed no-rmi-test option as it's no longer needed Index: build.xml =================================================================== RCS file: /cvsroot/openorb/OpenORB/src/build.xml,v retrieving revision 1.181 retrieving revision 1.182 diff -u -d -r1.181 -r1.182 --- build.xml 23 Jul 2004 09:49:36 -0000 1.181 +++ build.xml 29 Jul 2004 08:01:03 -0000 1.182 @@ -904,7 +904,7 @@ </java> </target> - <target name="run-rmiiiop-test" unless="no-rmi-test"> + <target name="run-rmiiiop-test"> <echo message="Running RMI-IIOP tests (useNativeLibrary=${useNativeLibrary})..." /> <java failonerror="true" classname="junit.textui.TestRunner" |
|
From: Richard G C. <pim...@us...> - 2004-07-29 07:59:15
|
Update of /cvsroot/openorb/OpenORB/src/compiler/org/openorb/compiler/rmi/parser In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19991/OpenORB/src/compiler/org/openorb/compiler/rmi/parser Modified Files: MappingAPI.java Log Message: checkstyle fixes Index: MappingAPI.java =================================================================== RCS file: /cvsroot/openorb/OpenORB/src/compiler/org/openorb/compiler/rmi/parser/MappingAPI.java,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- MappingAPI.java 29 Jul 2004 07:57:24 -0000 1.18 +++ MappingAPI.java 29 Jul 2004 07:59:07 -0000 1.19 @@ -236,7 +236,7 @@ private final JavaParser m_parser; private final IdlObject m_result; - ParserResult( final JavaParser parser, final IdlObject result) + ParserResult( final JavaParser parser, final IdlObject result ) { m_parser = parser; m_result = result; @@ -1612,7 +1612,8 @@ locExcepName = process_name( locExcepName ); // 2 - Processing differring case // *** Check if it already exists in the compilation tree *** - IdlObject locIdlObj = return_existing_object( process_new_full_class_name( c, locExcepName ) ); + IdlObject locIdlObj = return_existing_object( + process_new_full_class_name( c, locExcepName ) ); if ( locIdlObj == null ) { // Parse & map the unknown class |
|
From: Richard G C. <pim...@us...> - 2004-07-29 07:57:33
|
Update of /cvsroot/openorb/OpenORB/src/compiler/org/openorb/compiler/rmi/parser In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19724/OpenORB/src/compiler/org/openorb/compiler/rmi/parser Modified Files: MappingAPI.java Log Message: factored out class parsing calls & include generation Index: MappingAPI.java =================================================================== RCS file: /cvsroot/openorb/OpenORB/src/compiler/org/openorb/compiler/rmi/parser/MappingAPI.java,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- MappingAPI.java 28 Jul 2004 16:04:19 -0000 1.17 +++ MappingAPI.java 29 Jul 2004 07:57:24 -0000 1.18 @@ -217,154 +217,54 @@ m_rcp = rcp; } - private void appendTo( final StringBuffer buf, final Object obj ) + private ParserResult parseClass( final Class c ) { - if ( obj instanceof Object[] ) - { - final Object[] array = ( Object[] ) obj; - buf.append( '{' ); - if ( 0 != array.length ) - { - buf.append( '[' ); - appendTo( buf, array[0] ); - buf.append( ']' ); - for ( int i = 1; i < array.length; i++ ) - { - buf.append( ',' ); - buf.append( '[' ); - appendTo( buf, array[i] ); - buf.append( ']' ); - } - } - buf.append( '}' ); - return; - } - buf.append( obj ); - } + final JavaParser parser = new JavaParser( m_rcp, m_ch, + m_javaParser.getCompilationTree(), + m_javaParser.getMappingNames(), + m_javaParser.getAlreadyProcessedClasses() ); + final IdlObject result = parser.parse_java( c.getName() ); - private void display( final Object arg0 ) - { - if ( m_rcp.getM_verbose() ) - { - final StringBuffer buf = new StringBuffer(); - appendTo( buf, arg0 ); - m_ch.display( buf.toString() ); - } - } + // must be called after parse_java because the IdlRoot is chnaged for some types... + m_javaParser.getCompilationTree().add( parser.getIdlTreeRoot() ); - private void display( final Object arg0, final Object arg1, final Object arg2 ) - { - if ( m_rcp.getM_verbose() ) - { - final StringBuffer buf = new StringBuffer(); - appendTo( buf, arg0 ); - appendTo( buf, arg1 ); - appendTo( buf, arg2 ); - m_ch.display( buf.toString() ); - } + return new ParserResult( parser, result ); } - private void display( final Object arg0, final Object arg1, final Object arg2, - final Object arg3, final Object arg4 ) + private final class ParserResult { - if ( m_rcp.getM_verbose() ) + private final JavaParser m_parser; + private final IdlObject m_result; + + ParserResult( final JavaParser parser, final IdlObject result) { - final StringBuffer buf = new StringBuffer(); - appendTo( buf, arg0 ); - appendTo( buf, arg1 ); - appendTo( buf, arg2 ); - appendTo( buf, arg3 ); - appendTo( buf, arg4 ); - m_ch.display( buf.toString() ); + m_parser = parser; + m_result = result; } - } - private void display( final Object arg0, final Object arg1, final Object arg2, - final Object arg3, final Object arg4, final Object arg5, final Object arg6 ) - { - if ( m_rcp.getM_verbose() ) + IdlObject getResult() { - final StringBuffer buf = new StringBuffer(); - appendTo( buf, arg0 ); - appendTo( buf, arg1 ); - appendTo( buf, arg2 ); - appendTo( buf, arg3 ); - appendTo( buf, arg4 ); - appendTo( buf, arg5 ); - appendTo( buf, arg6 ); - m_ch.display( buf.toString() ); + return m_result; } - } - private void display( final Object arg0, final Object arg1, final Object arg2, - final Object arg3, final Object arg4, final Object arg5, final Object arg6, - final Object arg7, final Object arg8 ) - { - if ( m_rcp.getM_verbose() ) + IdlInclude makeRootInclude() { - final StringBuffer buf = new StringBuffer(); - appendTo( buf, arg0 ); - appendTo( buf, arg1 ); - appendTo( buf, arg2 ); - appendTo( buf, arg3 ); - appendTo( buf, arg4 ); - appendTo( buf, arg5 ); - appendTo( buf, arg6 ); - appendTo( buf, arg7 ); - appendTo( buf, arg8 ); - m_ch.display( buf.toString() ); + return new IdlInclude( m_javaParser.getIdlTreeRoot(), + convertName( m_parser.getIdlTreeRoot()._name ) ); } - } - private void display( final Object arg0, final Object arg1, final Object arg2, - final Object arg3, final Object arg4, final Object arg5, final Object arg6, - final Object arg7, final Object arg8, final Object arg9, final Object arg10 ) - { - if ( m_rcp.getM_verbose() ) + IdlInclude makeResultInclude() { - final StringBuffer buf = new StringBuffer(); - appendTo( buf, arg0 ); - appendTo( buf, arg1 ); - appendTo( buf, arg2 ); - appendTo( buf, arg3 ); - appendTo( buf, arg4 ); - appendTo( buf, arg5 ); - appendTo( buf, arg6 ); - appendTo( buf, arg7 ); - appendTo( buf, arg8 ); - appendTo( buf, arg9 ); - appendTo( buf, arg10 ); - m_ch.display( buf.toString() ); + return new IdlInclude( m_javaParser.getIdlTreeRoot(), + convertName( m_result.name() ) ); } - } - private void display( final Object arg0, final Object arg1, final Object arg2, - final Object arg3, final Object arg4, final Object arg5, final Object arg6, - final Object arg7, final Object arg8, final Object arg9, final Object arg10, - final Object arg11, final Object arg12 ) - { - if ( m_rcp.getM_verbose() ) + private String convertName( final String name ) { - final StringBuffer buf = new StringBuffer(); - appendTo( buf, arg0 ); - appendTo( buf, arg1 ); - appendTo( buf, arg2 ); - appendTo( buf, arg3 ); - appendTo( buf, arg4 ); - appendTo( buf, arg5 ); - appendTo( buf, arg6 ); - appendTo( buf, arg7 ); - appendTo( buf, arg8 ); - appendTo( buf, arg9 ); - appendTo( buf, arg10 ); - appendTo( buf, arg11 ); - appendTo( buf, arg12 ); - m_ch.display( buf.toString() ); + return name.replace( '.', '/' ); } } - - /** * Map the java package to an idlModule object in the idl tree * @@ -869,15 +769,12 @@ else { // Parse & map the unknown class - JavaParser locJavaParser = new JavaParser( m_rcp, m_ch, - m_javaParser.getCompilationTree(), m_javaParser.getMappingNames(), - m_javaParser.getAlreadyProcessedClasses() ); display( "map_inheritance -> map unknown class : " + c.getName() ); - locIdlObject = locJavaParser.parse_java( c.getName() ); - // Add the tree associated to this file to the tree List - // and assign to locIdlObj the returned tree - // must be called after parse_java because the IdlRoot is changed for some types... - m_javaParser.getCompilationTree().add( locJavaParser.getIdlTreeRoot() ); + final ParserResult result = parseClass( c ); + + + locIdlObject = result.getResult(); + // Get the good object (Exception = value type + exception) display( "map_inheritance -> look for : " + ( String ) m_javaParser.getMappingNames().get( c.getName() ) + " ( " + c.getName() + " ) " ); @@ -885,9 +782,7 @@ ( String ) m_javaParser.getMappingNames().get( c.getName() ), true ); // Add it to the include files add_idl_object_as_first( m_javaParser.getIdlTreeRoot(), - new IdlInclude( m_javaParser.getIdlTreeRoot(), - locJavaParser.getIdlTreeRoot()._name.replace( '.', - '/' ) ) ); + result.makeRootInclude() ); // Add the inheritance if ( parent instanceof IdlInterface ) { @@ -997,12 +892,9 @@ } else { - JavaParser locJavaParser = new JavaParser( m_rcp, m_ch, - m_javaParser.getCompilationTree(), m_javaParser.getMappingNames(), - m_javaParser.getAlreadyProcessedClasses() ); - locIdlObj = locJavaParser.parse_java( c.getName() ); - // must be called after parse_java because the IdlRoot is changed for some types... - m_javaParser.getCompilationTree().add( locJavaParser.getIdlTreeRoot() ); + final ParserResult result = parseClass( c ); + locIdlObj = result.getResult(); + // Find the good object in this tree locIdlFullName = ( String ) m_javaParser.getMappingNames().get( c.getName() ); if ( locIdlFullName != null ) @@ -1010,9 +902,7 @@ locIdlObj = return_existing_object( locIdlFullName ); // Add it to the include files add_idl_object_as_first( m_javaParser.getIdlTreeRoot(), - new IdlInclude( m_javaParser.getIdlTreeRoot(), - locJavaParser.getIdlTreeRoot()._name.replace( '.', - '/' ) ) ); + result.makeRootInclude() ); // Add it to the tree int ctype = setClassType( c ); if ( ctype == RMI_IDL_VALUE_TYPES_TYPE || ctype == RMI_IDL_CUSTOM_VALUE_TYPES_TYPE ) @@ -1722,27 +1612,19 @@ locExcepName = process_name( locExcepName ); // 2 - Processing differring case // *** Check if it already exists in the compilation tree *** - IdlObject locIdlObj = null; - locIdlObj = return_existing_object( process_new_full_class_name( c, locExcepName ) ); + IdlObject locIdlObj = return_existing_object( process_new_full_class_name( c, locExcepName ) ); if ( locIdlObj == null ) { // Parse & map the unknown class - JavaParser locJavaParser = new JavaParser( m_rcp, m_ch, - m_javaParser.getCompilationTree(), m_javaParser.getMappingNames(), - m_javaParser.getAlreadyProcessedClasses() ); - locIdlObj = locJavaParser.parse_java( c.getName() ); - // Add the tree associated to this file to the tree List - // and assign to locIdlObj the returned tree - // must be called after parse_java because the IdlRoot is changed for some types... - m_javaParser.getCompilationTree().add( locJavaParser.getIdlTreeRoot() ); + final ParserResult result = parseClass( c ); + locIdlObj = result.getResult(); + // Get the good object (Exception = value type + exception locIdlObj = locIdlObj.returnObject( process_new_full_class_name( c, locExcepName ), true ); // Add it to the include files add_idl_object_as_first( m_javaParser.getIdlTreeRoot(), - new IdlInclude( m_javaParser.getIdlTreeRoot(), - locJavaParser.getIdlTreeRoot()._name.replace( '.', - '/' ) ) ); + result.makeRootInclude() ); } // *** Set opaque type if not intialized *** if ( locIdlObj.opaque() == null ) @@ -2198,38 +2080,22 @@ } else { - // Parse & map the unknown class - JavaParser locJavaParser = new JavaParser( m_rcp, m_ch, - m_javaParser.getCompilationTree(), m_javaParser.getMappingNames(), - m_javaParser.getAlreadyProcessedClasses() ); - // Add the tree associated to this file to the tree List - IdlObject locIdlObj1 = null; - locIdlObj1 = locJavaParser.parse_java( c.getName() ); - // must be called after parse_java because the IdlRoot is changed for some types - m_javaParser.getCompilationTree().add( locJavaParser.getIdlTreeRoot() ); + final ParserResult result = parseClass( c ); + final IdlObject locIdlObj1 = result.getResult(); // Add it to the include files add_idl_object_as_first( m_javaParser.getIdlTreeRoot(), - new IdlInclude( m_javaParser.getIdlTreeRoot(), - locJavaParser.getIdlTreeRoot()._name.replace( '.', - '/' ) ) ); + result.makeRootInclude() ); } } else { // Parse & map the unknown class - JavaParser locJavaParser = new JavaParser( m_rcp, m_ch, - m_javaParser.getCompilationTree(), m_javaParser.getMappingNames(), - m_javaParser.getAlreadyProcessedClasses() ); - // Add the tree associated to this file to the tree List - IdlObject locIdlObj1 = null; - locIdlObj1 = locJavaParser.parse_java( c.getName() ); - // must be called after parse_java because the IdlRoot is changed for some types... - m_javaParser.getCompilationTree().add( locJavaParser.getIdlTreeRoot() ); + final ParserResult result = parseClass( c ); + final IdlObject locIdlObj1 = result.getResult(); + // Add it to the include files add_idl_object_as_first( m_javaParser.getIdlTreeRoot(), - new IdlInclude( m_javaParser.getIdlTreeRoot(), - locJavaParser.getIdlTreeRoot()._name.replace( '.', - '/' ) ) ); + result.makeRootInclude() ); } // Check one more time if the class exists now loc_full_class_name = ( String ) m_javaParser.getMappingNames().get( c.getName() ); @@ -2280,12 +2146,9 @@ else { // *** Parse & map the unknown class *** - JavaParser locJavaParser = new JavaParser( m_rcp, m_ch, - m_javaParser.getCompilationTree(), m_javaParser.getMappingNames(), - m_javaParser.getAlreadyProcessedClasses() ); - locIdlObj = locJavaParser.parse_java( c.getName() ); - // must be called after parse_java because the IdlRoot is changed for some types... - m_javaParser.getCompilationTree().add( locJavaParser.getIdlTreeRoot() ); + final ParserResult result = parseClass( c ); + locIdlObj = result.getResult(); + // Find the good object in this tree locArrayIdlFullName = ( String ) m_javaParser.getMappingNames().get( c.getName() ); if ( locArrayIdlFullName != null ) @@ -2293,9 +2156,7 @@ locIdlObj = return_existing_object( locArrayIdlFullName ); // Add it to the include files add_idl_object_as_first( m_javaParser.getIdlTreeRoot(), - new IdlInclude( m_javaParser.getIdlTreeRoot(), - locJavaParser.getIdlTreeRoot()._name.replace( '.', - '/' ) ) ); + result.makeRootInclude() ); // Add it to the tree IdlObject locIdlIdent = new IdlIdent( "", parent, locIdlObj ); parent.addIdlObject( locIdlIdent ); @@ -2551,18 +2412,12 @@ else { // Parse & map the unknown class - JavaParser locJavaParser = new JavaParser( m_rcp, m_ch, - m_javaParser.getCompilationTree(), m_javaParser.getMappingNames(), - m_javaParser.getAlreadyProcessedClasses() ); - // Add the tree associated to this file to the tree vector - locIdlObj = locJavaParser.parse_java( cmpt.getName() ); - // must be called after parse_java because the IdlRoot is changed for some types... - m_javaParser.getCompilationTree().add( locJavaParser.getIdlTreeRoot() ); + final ParserResult result = parseClass( cmpt ); + locIdlObj = result.getResult(); + // Add it to the include files add_idl_object_as_first( m_javaParser.getIdlTreeRoot(), - new IdlInclude( m_javaParser.getIdlTreeRoot(), - locJavaParser.getIdlTreeRoot()._name.replace( '.', - java.io.File.separatorChar ) ) ); + result.makeRootInclude() ); // Find the associated name locIdlObjName = ( String ) m_javaParser.getMappingNames().get( cmpt.getName() ); locIdlObj = return_existing_object( locIdlObjName ); @@ -3004,16 +2859,12 @@ else { // *** Parse & map the unknown class *** - JavaParser locJavaParser = new JavaParser( m_rcp, m_ch, - m_javaParser.getCompilationTree(), m_javaParser.getMappingNames(), - m_javaParser.getAlreadyProcessedClasses() ); - locIdlObj = locJavaParser.parse_java( c.getName() ); - // must be called after parse_java because the IdlRoot is changed for some types - m_javaParser.getCompilationTree().add( locJavaParser.getIdlTreeRoot() ); + final ParserResult result = parseClass( c ); + locIdlObj = result.getResult(); + // Add it to the include files add_idl_object_as_first( m_javaParser.getIdlTreeRoot(), - new IdlInclude( m_javaParser.getIdlTreeRoot(), - locIdlObj.name().replace( '.', '/' ) ) ); + result.makeResultInclude() ); // Add it to the tree locName = locIdlObj.name().replace( '.', '_' ); } @@ -3097,16 +2948,12 @@ else { // *** Parse & map the unknown class *** - JavaParser locJavaParser = new JavaParser( m_rcp, m_ch, - m_javaParser.getCompilationTree(), m_javaParser.getMappingNames(), - m_javaParser.getAlreadyProcessedClasses() ); - locIdlObj = locJavaParser.parse_java( c.getName() ); - // must be called after parse_java because the IdlRoot is changed for some types - m_javaParser.getCompilationTree().add( locJavaParser.getIdlTreeRoot() ); + final ParserResult result = parseClass( c ); + locIdlObj = result.getResult(); + // Add it to the include files add_idl_object_as_first( m_javaParser.getIdlTreeRoot(), - new IdlInclude( m_javaParser.getIdlTreeRoot(), - locIdlObj.name().replace( '.', '/' ) ) ); + result.makeResultInclude() ); // Add it to the tree locName = locIdlObj.name().replace( '.', '_' ); } @@ -3659,4 +3506,151 @@ "], (IdlObject)[", sub_idlObj, "])" ); idlObj._list.insertElementAt( sub_idlObj, 0 ); } + + private void appendTo( final StringBuffer buf, final Object obj ) + { + if ( obj instanceof Object[] ) + { + final Object[] array = ( Object[] ) obj; + buf.append( '{' ); + if ( 0 != array.length ) + { + buf.append( '[' ); + appendTo( buf, array[0] ); + buf.append( ']' ); + for ( int i = 1; i < array.length; i++ ) + { + buf.append( ',' ); + buf.append( '[' ); + appendTo( buf, array[i] ); + buf.append( ']' ); + } + } + buf.append( '}' ); + return; + } + buf.append( obj ); + } + + private void display( final Object arg0 ) + { + if ( m_rcp.getM_verbose() ) + { + final StringBuffer buf = new StringBuffer(); + appendTo( buf, arg0 ); + m_ch.display( buf.toString() ); + } + } + + private void display( final Object arg0, final Object arg1, final Object arg2 ) + { + if ( m_rcp.getM_verbose() ) + { + final StringBuffer buf = new StringBuffer(); + appendTo( buf, arg0 ); + appendTo( buf, arg1 ); + appendTo( buf, arg2 ); + m_ch.display( buf.toString() ); + } + } + + private void display( final Object arg0, final Object arg1, final Object arg2, + final Object arg3, final Object arg4 ) + { + if ( m_rcp.getM_verbose() ) + { + final StringBuffer buf = new StringBuffer(); + appendTo( buf, arg0 ); + appendTo( buf, arg1 ); + appendTo( buf, arg2 ); + appendTo( buf, arg3 ); + appendTo( buf, arg4 ); + m_ch.display( buf.toString() ); + } + } + + private void display( final Object arg0, final Object arg1, final Object arg2, + final Object arg3, final Object arg4, final Object arg5, final Object arg6 ) + { + if ( m_rcp.getM_verbose() ) + { + final StringBuffer buf = new StringBuffer(); + appendTo( buf, arg0 ); + appendTo( buf, arg1 ); + appendTo( buf, arg2 ); + appendTo( buf, arg3 ); + appendTo( buf, arg4 ); + appendTo( buf, arg5 ); + appendTo( buf, arg6 ); + m_ch.display( buf.toString() ); + } + } + + private void display( final Object arg0, final Object arg1, final Object arg2, + final Object arg3, final Object arg4, final Object arg5, final Object arg6, + final Object arg7, final Object arg8 ) + { + if ( m_rcp.getM_verbose() ) + { + final StringBuffer buf = new StringBuffer(); + appendTo( buf, arg0 ); + appendTo( buf, arg1 ); + appendTo( buf, arg2 ); + appendTo( buf, arg3 ); + appendTo( buf, arg4 ); + appendTo( buf, arg5 ); + appendTo( buf, arg6 ); + appendTo( buf, arg7 ); + appendTo( buf, arg8 ); + m_ch.display( buf.toString() ); + } + } + + private void display( final Object arg0, final Object arg1, final Object arg2, + final Object arg3, final Object arg4, final Object arg5, final Object arg6, + final Object arg7, final Object arg8, final Object arg9, final Object arg10 ) + { + if ( m_rcp.getM_verbose() ) + { + final StringBuffer buf = new StringBuffer(); + appendTo( buf, arg0 ); + appendTo( buf, arg1 ); + appendTo( buf, arg2 ); + appendTo( buf, arg3 ); + appendTo( buf, arg4 ); + appendTo( buf, arg5 ); + appendTo( buf, arg6 ); + appendTo( buf, arg7 ); + appendTo( buf, arg8 ); + appendTo( buf, arg9 ); + appendTo( buf, arg10 ); + m_ch.display( buf.toString() ); + } + } + + private void display( final Object arg0, final Object arg1, final Object arg2, + final Object arg3, final Object arg4, final Object arg5, final Object arg6, + final Object arg7, final Object arg8, final Object arg9, final Object arg10, + final Object arg11, final Object arg12 ) + { + if ( m_rcp.getM_verbose() ) + { + final StringBuffer buf = new StringBuffer(); + appendTo( buf, arg0 ); + appendTo( buf, arg1 ); + appendTo( buf, arg2 ); + appendTo( buf, arg3 ); + appendTo( buf, arg4 ); + appendTo( buf, arg5 ); + appendTo( buf, arg6 ); + appendTo( buf, arg7 ); + appendTo( buf, arg8 ); + appendTo( buf, arg9 ); + appendTo( buf, arg10 ); + appendTo( buf, arg11 ); + appendTo( buf, arg12 ); + m_ch.display( buf.toString() ); + } + } + } |
|
From: Michael R. <mr...@us...> - 2004-07-29 07:30:10
|
Update of /cvsroot/openorb/tools/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15780/src Modified Files: build.xml Log Message: Fixed compile under AIX IBM JDK 1.4.2. It was working with 1.4.1 before. Index: build.xml =================================================================== RCS file: /cvsroot/openorb/tools/src/build.xml,v retrieving revision 1.39 retrieving revision 1.40 diff -u -d -r1.39 -r1.40 --- build.xml 27 Jul 2004 06:30:05 -0000 1.39 +++ build.xml 29 Jul 2004 07:30:01 -0000 1.40 @@ -85,7 +85,7 @@ or local.properties file. --> <property name="jdk-runtime-library" - value="${java.home}/lib/rt.jar:${java.home}/lib/core.jar:${java.home}/lib/server.jar"/> + value="${java.home}/lib/rt.jar:${java.home}/lib/core.jar:${java.home}/lib/server.jar:${java.home}/lib/ibmorbapi.jar"/> <!-- =========================================== --> |
|
From: Michael R. <mr...@us...> - 2004-07-29 07:30:10
|
Update of /cvsroot/openorb/tools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15780 Modified Files: WHATSNEW Log Message: Fixed compile under AIX IBM JDK 1.4.2. It was working with 1.4.1 before. Index: WHATSNEW =================================================================== RCS file: /cvsroot/openorb/tools/WHATSNEW,v retrieving revision 1.75 retrieving revision 1.76 diff -u -d -r1.75 -r1.76 --- WHATSNEW 27 Jul 2004 06:30:05 -0000 1.75 +++ WHATSNEW 29 Jul 2004 07:30:01 -0000 1.76 @@ -1,6 +1,9 @@ OpenORB tools ------------- +- For IBM JDK 1.4.2 the ibmorbapi.jar must be put on the jdk.runtime.jars + property otherwise org.omg.CORBA.SystemException will not be found. + - Added HSQLDB jar which substitutes the InstantDB formerly available for OTS only. |
|
From: Michael R. <mr...@us...> - 2004-07-28 16:04:30
|
Update of /cvsroot/openorb/OpenORB/src/compiler/org/openorb/compiler/rmi/parser In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4786/OpenORB/src/compiler/org/openorb/compiler/rmi/parser Modified Files: MappingAPI.java Log Message: Fixed bug #955143 Index: MappingAPI.java =================================================================== RCS file: /cvsroot/openorb/OpenORB/src/compiler/org/openorb/compiler/rmi/parser/MappingAPI.java,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- MappingAPI.java 28 Jul 2004 15:18:05 -0000 1.16 +++ MappingAPI.java 28 Jul 2004 16:04:19 -0000 1.17 @@ -873,10 +873,11 @@ m_javaParser.getCompilationTree(), m_javaParser.getMappingNames(), m_javaParser.getAlreadyProcessedClasses() ); display( "map_inheritance -> map unknown class : " + c.getName() ); + locIdlObject = locJavaParser.parse_java( c.getName() ); // Add the tree associated to this file to the tree List // and assign to locIdlObj the returned tree + // must be called after parse_java because the IdlRoot is changed for some types... m_javaParser.getCompilationTree().add( locJavaParser.getIdlTreeRoot() ); - locIdlObject = locJavaParser.parse_java( c.getName() ); // Get the good object (Exception = value type + exception) display( "map_inheritance -> look for : " + ( String ) m_javaParser.getMappingNames().get( c.getName() ) + " ( " + c.getName() + " ) " ); @@ -999,8 +1000,9 @@ JavaParser locJavaParser = new JavaParser( m_rcp, m_ch, m_javaParser.getCompilationTree(), m_javaParser.getMappingNames(), m_javaParser.getAlreadyProcessedClasses() ); - m_javaParser.getCompilationTree().add( locJavaParser.getIdlTreeRoot() ); locIdlObj = locJavaParser.parse_java( c.getName() ); + // must be called after parse_java because the IdlRoot is changed for some types... + m_javaParser.getCompilationTree().add( locJavaParser.getIdlTreeRoot() ); // Find the good object in this tree locIdlFullName = ( String ) m_javaParser.getMappingNames().get( c.getName() ); if ( locIdlFullName != null ) @@ -1728,10 +1730,11 @@ JavaParser locJavaParser = new JavaParser( m_rcp, m_ch, m_javaParser.getCompilationTree(), m_javaParser.getMappingNames(), m_javaParser.getAlreadyProcessedClasses() ); + locIdlObj = locJavaParser.parse_java( c.getName() ); // Add the tree associated to this file to the tree List // and assign to locIdlObj the returned tree + // must be called after parse_java because the IdlRoot is changed for some types... m_javaParser.getCompilationTree().add( locJavaParser.getIdlTreeRoot() ); - locIdlObj = locJavaParser.parse_java( c.getName() ); // Get the good object (Exception = value type + exception locIdlObj = locIdlObj.returnObject( process_new_full_class_name( c, locExcepName ), true ); @@ -2201,8 +2204,9 @@ m_javaParser.getAlreadyProcessedClasses() ); // Add the tree associated to this file to the tree List IdlObject locIdlObj1 = null; - m_javaParser.getCompilationTree().add( locJavaParser.getIdlTreeRoot() ); locIdlObj1 = locJavaParser.parse_java( c.getName() ); + // must be called after parse_java because the IdlRoot is changed for some types + m_javaParser.getCompilationTree().add( locJavaParser.getIdlTreeRoot() ); // Add it to the include files add_idl_object_as_first( m_javaParser.getIdlTreeRoot(), new IdlInclude( m_javaParser.getIdlTreeRoot(), @@ -2219,7 +2223,7 @@ // Add the tree associated to this file to the tree List IdlObject locIdlObj1 = null; locIdlObj1 = locJavaParser.parse_java( c.getName() ); - // must be called after parse_java because the IdlRoot is chnaged for some types... + // must be called after parse_java because the IdlRoot is changed for some types... m_javaParser.getCompilationTree().add( locJavaParser.getIdlTreeRoot() ); // Add it to the include files add_idl_object_as_first( m_javaParser.getIdlTreeRoot(), @@ -2279,8 +2283,9 @@ JavaParser locJavaParser = new JavaParser( m_rcp, m_ch, m_javaParser.getCompilationTree(), m_javaParser.getMappingNames(), m_javaParser.getAlreadyProcessedClasses() ); - m_javaParser.getCompilationTree().add( locJavaParser.getIdlTreeRoot() ); locIdlObj = locJavaParser.parse_java( c.getName() ); + // must be called after parse_java because the IdlRoot is changed for some types... + m_javaParser.getCompilationTree().add( locJavaParser.getIdlTreeRoot() ); // Find the good object in this tree locArrayIdlFullName = ( String ) m_javaParser.getMappingNames().get( c.getName() ); if ( locArrayIdlFullName != null ) @@ -2549,19 +2554,22 @@ JavaParser locJavaParser = new JavaParser( m_rcp, m_ch, m_javaParser.getCompilationTree(), m_javaParser.getMappingNames(), m_javaParser.getAlreadyProcessedClasses() ); - // Add the tree associated to this file to the tree List - m_javaParser.getCompilationTree().add( locJavaParser.getIdlTreeRoot() ); + // Add the tree associated to this file to the tree vector locIdlObj = locJavaParser.parse_java( cmpt.getName() ); + // must be called after parse_java because the IdlRoot is changed for some types... + m_javaParser.getCompilationTree().add( locJavaParser.getIdlTreeRoot() ); // Add it to the include files add_idl_object_as_first( m_javaParser.getIdlTreeRoot(), new IdlInclude( m_javaParser.getIdlTreeRoot(), locJavaParser.getIdlTreeRoot()._name.replace( '.', - '/' ) ) ); + java.io.File.separatorChar ) ) ); // Find the associated name locIdlObjName = ( String ) m_javaParser.getMappingNames().get( cmpt.getName() ); locIdlObj = return_existing_object( locIdlObjName ); if ( locIdlObj != null ) { + IdlObject locIdlIdent = new IdlIdent( "", parent, locIdlObj ); + parent.addIdlObject( locIdlIdent ); locStr += locIdlObj._name; } else @@ -2999,8 +3007,9 @@ JavaParser locJavaParser = new JavaParser( m_rcp, m_ch, m_javaParser.getCompilationTree(), m_javaParser.getMappingNames(), m_javaParser.getAlreadyProcessedClasses() ); - m_javaParser.getCompilationTree().add( locJavaParser.getIdlTreeRoot() ); locIdlObj = locJavaParser.parse_java( c.getName() ); + // must be called after parse_java because the IdlRoot is changed for some types + m_javaParser.getCompilationTree().add( locJavaParser.getIdlTreeRoot() ); // Add it to the include files add_idl_object_as_first( m_javaParser.getIdlTreeRoot(), new IdlInclude( m_javaParser.getIdlTreeRoot(), @@ -3091,8 +3100,9 @@ JavaParser locJavaParser = new JavaParser( m_rcp, m_ch, m_javaParser.getCompilationTree(), m_javaParser.getMappingNames(), m_javaParser.getAlreadyProcessedClasses() ); - m_javaParser.getCompilationTree().add( locJavaParser.getIdlTreeRoot() ); locIdlObj = locJavaParser.parse_java( c.getName() ); + // must be called after parse_java because the IdlRoot is changed for some types + m_javaParser.getCompilationTree().add( locJavaParser.getIdlTreeRoot() ); // Add it to the include files add_idl_object_as_first( m_javaParser.getIdlTreeRoot(), new IdlInclude( m_javaParser.getIdlTreeRoot(), |
|
From: Michael R. <mr...@us...> - 2004-07-28 16:04:29
|
Update of /cvsroot/openorb/OpenORB In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4786/OpenORB Modified Files: WHATSNEW Log Message: Fixed bug #955143 Index: WHATSNEW =================================================================== RCS file: /cvsroot/openorb/OpenORB/WHATSNEW,v retrieving revision 1.225 retrieving revision 1.226 diff -u -d -r1.225 -r1.226 --- WHATSNEW 28 Jul 2004 12:10:50 -0000 1.225 +++ WHATSNEW 28 Jul 2004 16:04:18 -0000 1.226 @@ -1,6 +1,16 @@ OpenORB ------- +- Fixed bug #955143. The problem of marshaling the array type + org.omg.CORBA.Any[] was due to a different behaviour of the parser + in the simple case (org.omg.CORBA.Any) and the array type. + This problem only appeared when org.omg.CORBA.Any has not + been parsed before. But our test case RemoteComplex has another + method that just uses the type org.omg.CORBA.Any so that this bug + never showed up under UNIX. Only Windows uncovered the problem + but it is still not known what the difference between the Windows + VM and the UNIX VMs was. + - Always use the native library on AIX with VM 1.4.x. - When setting the property UtilDelegateImpl.setLocalCodebaseOnly(true) |
|
From: Michael R. <mr...@us...> - 2004-07-28 16:03:50
|
Update of /cvsroot/openorb/OpenORB/src/test/org/openorb/orb/test/rmi/complex In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4581/OpenORB/src/test/org/openorb/orb/test/rmi/complex Modified Files: RemoteComplex.java Log Message: Turned around the echo_any methods to make bug #955143 appear Index: RemoteComplex.java =================================================================== RCS file: /cvsroot/openorb/OpenORB/src/test/org/openorb/orb/test/rmi/complex/RemoteComplex.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- RemoteComplex.java 11 Nov 2003 14:38:17 -0000 1.1 +++ RemoteComplex.java 28 Jul 2004 16:03:24 -0000 1.2 @@ -216,8 +216,8 @@ * @return The Any instance. * @throws RemoteException When an error occurs. */ - org.omg.CORBA.Any echo_any( org.omg.CORBA.Any any ) throws RemoteException; org.omg.CORBA.Any[] echo_any( org.omg.CORBA.Any[] any ) throws RemoteException; + org.omg.CORBA.Any echo_any( org.omg.CORBA.Any any ) throws RemoteException; /** * JavaToIdl failed passing objects derived from IDLEntity. |
|
From: Richard G C. <pim...@us...> - 2004-07-28 15:50:12
|
Update of /cvsroot/openorb/OpenORB/src/compiler/org/openorb/compiler/object In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1344/OpenORB/src/compiler/org/openorb/compiler/object Modified Files: IdlObject.java Log Message: refactoring + more verbose output Index: IdlObject.java =================================================================== RCS file: /cvsroot/openorb/OpenORB/src/compiler/org/openorb/compiler/object/IdlObject.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- IdlObject.java 28 Jul 2004 15:18:04 -0000 1.6 +++ IdlObject.java 28 Jul 2004 15:49:55 -0000 1.7 @@ -151,7 +151,7 @@ public String toString() { - return getClass() + "{name=[" + idlName() + "], id=[" + idlID() + "]"; + return getClass() + "{name=[" + idlName() + "], id=[" + idlID() + "]}"; } public IdlParser getParser() |
|
From: Richard G C. <pim...@us...> - 2004-07-28 15:18:14
|
Update of /cvsroot/openorb/OpenORB/src/compiler/org/openorb/compiler/rmi/parser In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29014/OpenORB/src/compiler/org/openorb/compiler/rmi/parser Modified Files: JavaParser.java MappingAPI.java Log Message: refactoring + more verbose output Index: JavaParser.java =================================================================== RCS file: /cvsroot/openorb/OpenORB/src/compiler/org/openorb/compiler/rmi/parser/JavaParser.java,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- JavaParser.java 22 Jul 2004 12:25:44 -0000 1.14 +++ JavaParser.java 28 Jul 2004 15:18:05 -0000 1.15 @@ -10,8 +10,10 @@ import java.io.FileNotFoundException; -import java.util.Hashtable; -import java.util.Vector; +import java.util.Map; +import java.util.List; +import java.util.HashMap; +import java.util.ArrayList; import org.openorb.compiler.CompilerHost; @@ -24,6 +26,8 @@ import org.openorb.compiler.rmi.RmiCompilerProperties; +import org.openorb.compiler.orb.Configurator; + /** * This class builds the java data tree needed for the generation of * idl code. @@ -37,25 +41,25 @@ * Compilation tree vector. This vector holds all the sub-trees * created by all JavaParser instances. */ - private Vector m_compilationTreeVector = null; + private List m_compilationTreeVector; /** Classes that have been already processed. */ - private Vector m_alreadyProcessedClasses = null; + private List m_alreadyProcessedClasses; /** Association between the Java name and the IDL linked mapping. */ - private Hashtable m_mappingNames = null; + private Map m_mappingNames; - private RmiCompilerProperties m_rcp = null; + private RmiCompilerProperties m_rcp; - private CompilerHost m_ch = null; + private CompilerHost m_ch; /** The root node of the IDL tree. A per instance variable. */ - private IdlObject m_idlTreeRoot = null; + private IdlObject m_idlTreeRoot; - private IdlParser m_idlparser = null; + private IdlParser m_idlparser; /** The current parsed class. */ - private Class m_currentClass = null; + private Class m_currentClass; /** * Constructor. @@ -68,8 +72,9 @@ * @param alreadyProcessedClasses A vector of classes that have already been processed * by this JavaParser tree. */ - public JavaParser( RmiCompilerProperties rcp, CompilerHost ch, - Vector compilationTreeVector, Hashtable mappingNames, Vector alreadyProcessedClasses ) + public JavaParser( final RmiCompilerProperties rcp, final CompilerHost ch, + final List compilationTreeVector, final Map mappingNames, + final List alreadyProcessedClasses ) { m_ch = ch; m_rcp = rcp; @@ -91,7 +96,7 @@ } else { - m_alreadyProcessedClasses = new Vector(); + m_alreadyProcessedClasses = new ArrayList(); } if ( mappingNames != null ) @@ -100,7 +105,7 @@ } else { - m_mappingNames = new Hashtable(); + m_mappingNames = new HashMap(); } if ( compilationTreeVector != null ) @@ -109,30 +114,23 @@ } else { - m_compilationTreeVector = new Vector(); + m_compilationTreeVector = new ArrayList(); } // The IdlRoot is a new instance for each JavaParser instance - m_compilationTreeVector.addElement( getIdlTreeRoot() ); + m_compilationTreeVector.add( getIdlTreeRoot() ); // add the standard mappings only once if ( compilationTreeVector != null && mappingNames != null && alreadyProcessedClasses != null ) { - m_mappingNames.put( new String( "java.lang.Object" ), - new String( "::java::lang::_Object" ) ); - m_mappingNames.put( new String( "org.omg.CORBA.Object" ), - new String( "::CORBA::Object" ) ); - m_mappingNames.put( new String( "java.rmi.Remote" ), - new String( "::java::rmi::Remote" ) ); - m_mappingNames.put( new String( "java.io.Serializable" ), - new String( "::java::io::Serializable" ) ); - m_mappingNames.put( new String( "java.io.Externalizable" ), - new String( "::java::io::Externalizable" ) ); - m_mappingNames.put( new String( "java.lang.Class" ), - new String( "::javax::rmi::CORBA::ClassDesc" ) ); - m_mappingNames.put( new String( "java.lang.String" ), - new String( "::CORBA::WStringValue" ) ); + m_mappingNames.put( "java.lang.Object", "::java::lang::_Object" ); + m_mappingNames.put( "org.omg.CORBA.Object", "::CORBA::Object" ); + m_mappingNames.put( "java.rmi.Remote", "::java::rmi::Remote" ); + m_mappingNames.put( "java.io.Serializable", "::java::io::Serializable" ); + m_mappingNames.put( "java.io.Externalizable", "::java::io::Externalizable" ); + m_mappingNames.put( "java.lang.Class", "::javax::rmi::CORBA::ClassDesc" ); + m_mappingNames.put( "java.lang.String", "::CORBA::WStringValue" ); } } @@ -141,7 +139,7 @@ * * @return The compilation tree vector. */ - public Vector getCompilationTree() + public List getCompilationTree() { return m_compilationTreeVector; } @@ -151,17 +149,17 @@ * * @return The already processed classes vector. */ - public Vector getAlreadyProcessedClasses() + public List getAlreadyProcessedClasses() { return m_alreadyProcessedClasses; } /** - * Return the Hashtable of Java - IDL name mappings. + * Return the Map of Java - IDL name mappings. * - * @return The Hashtable of Java - IDL name mappings. + * @return The Map of Java - IDL name mappings. */ - public Hashtable getMappingNames() + public Map getMappingNames() { return m_mappingNames; } @@ -186,7 +184,7 @@ * * @param new_idl_root The root of the parsing tree. */ - public void setIdlTreeRoot( IdlObject new_idl_root ) + public void setIdlTreeRoot( final IdlObject new_idl_root ) { m_idlTreeRoot = new_idl_root; } @@ -196,7 +194,7 @@ * * @param newClass The new class to be parsed. */ - public void setCurrentClass( Class newClass ) + public void setCurrentClass( final Class newClass ) { m_currentClass = newClass; } @@ -218,15 +216,16 @@ * @param limit ??? * @return The object if one was found, null otherwise. */ - public IdlObject returnObject( String scope, boolean limit ) + public IdlObject returnObject( final String scope, final boolean limit ) { - for ( int i = 0; i < m_compilationTreeVector.size(); i++ ) + final int size = m_compilationTreeVector.size(); + for ( int i = 0; i < size; i++ ) { - IdlObject obj = ( IdlObject ) m_compilationTreeVector.elementAt( i ); - obj = obj.returnObject( scope, limit ); - if ( obj != null ) + final IdlObject obj = ( IdlObject ) m_compilationTreeVector.get( i ); + final IdlObject newObj = obj.returnObject( scope, limit ); + if ( newObj != null ) { - return obj; + return newObj; } } return null; @@ -238,7 +237,7 @@ * @param java_file_name The name of the file to parse. * @return The IdlObject representing the parsed class. */ - public IdlObject parse_java( String java_file_name ) + public IdlObject parse_java( final String java_file_name ) { return parse_java( java_file_name, false ); } @@ -251,15 +250,16 @@ * and try to get the remote interface in this case. * @return The IdlObject representing the parsed class. */ - public IdlObject parse_java( String java_file_name, boolean check_implements ) + public IdlObject parse_java( final String java_file_name, final boolean check_implements ) { - display( "JavaParser::parse_java" ); + display( "JavaParser::parse_java((String)[", java_file_name, + "], (boolean)[", ( check_implements ? "true" : "flase" ), "])" ); // Loading the class try { m_currentClass = load_class( java_file_name ); } - catch ( ClassNotFoundException cnfe ) + catch ( final ClassNotFoundException cnfe ) { System.out.println( "<!> Class not found exception raised : " + java_file_name ); // TODO: compile when the class can't be found @@ -269,7 +269,7 @@ // *** Check whether we ar running on the impl instead of the interface if ( check_implements && !m_currentClass.isInterface() ) { - Class[] clzs = m_currentClass.getInterfaces(); + final Class[] clzs = m_currentClass.getInterfaces(); Class remclz = null; // *** search for a remote interface for ( int i = 0; i < clzs.length; i++ ) @@ -292,12 +292,11 @@ if ( remclz != null ) { m_currentClass = remclz; - java_file_name = remclz.getName(); } else { System.out.println( "Error: No interface java.rmi.Remote found: " - + m_currentClass ); + + m_currentClass ); return null; } } @@ -314,30 +313,54 @@ * * @exception ClassNotFoundException If no class was found. */ - public Class load_class( String filename ) - throws ClassNotFoundException + public Class load_class( final String filename ) throws ClassNotFoundException { - display( "JavaParser::load_class" ); - Class myLocClass = null; + display( "JavaParser::load_class((String)[", filename, "])" ); try { - myLocClass = m_rcp.getClassloader().loadClass( filename ); + final Class myLocClass = m_rcp.getClassloader().loadClass( filename ); + display( "Class " + filename + " loaded." ); + return myLocClass; } - catch ( ClassNotFoundException cnfe ) + catch ( final ClassNotFoundException cnfe ) { display( "class loader type = " + m_rcp.getClassloader().getClass().getName() ); display( cnfe.toString() ); throw cnfe; } - display( "Class " + filename + " loaded." ); - return myLocClass; } - private void display( String s ) + private void display( final String arg0 ) { if ( m_rcp.getM_verbose() ) { - m_ch.display( s ); + m_ch.display( arg0 ); + } + } + + private void display( final String arg0, final Object arg1, final Object arg2 ) + { + if ( m_rcp.getM_verbose() ) + { + m_ch.display( arg0 + arg1 + arg2 ); + } + } + + private void display( final String arg0, final Object arg1, final Object arg2, + final Object arg3, final Object arg4 ) + { + if ( m_rcp.getM_verbose() ) + { + m_ch.display( arg0 + arg1 + arg2 + arg3 + arg4 ); + } + } + + private void display( final String arg0, final Object arg1, final Object arg2, + final Object arg3, final Object arg4, final Object arg5, final Object arg6 ) + { + if ( m_rcp.getM_verbose() ) + { + m_ch.display( arg0 + arg1 + arg2 + arg3 + arg4 + arg5 + arg6 ); } } @@ -346,11 +369,12 @@ * * @param c The class to parse. */ - public void parse_class( Class c ) + public void parse_class( final Class c ) { - display( "JavaParser::parse_class" ); + display( "JavaParser::parse_class((Class)[", c, "])" ); MappingAPI locMappingAPI = new MappingAPI( m_rcp, m_ch, this ); - IdlObject locIdlObj = null; + + final IdlObject locIdlObj; // *** Map the package *** if ( !c.isInterface() && c.isArray() ) { @@ -364,8 +388,7 @@ // *** Checks the class type (interface or object class) *** if ( c.isInterface() ) { - display( "*** Interface " + c.getName() - + " detected." ); + display( "*** Interface " + c.getName() + " detected." ); locMappingAPI.map_interface( c, locIdlObj ); } else @@ -385,14 +408,13 @@ * @param configurator The configuration class with all the settings. * @param include The vector with included classes. */ - public void load_standard_idl( org.openorb.compiler.orb.Configurator configurator, - Vector include ) + public void load_standard_idl( final Configurator configurator, final List include ) { - m_compilationTreeVector.addElement( add_idl_file( include, configurator, + m_compilationTreeVector.add( add_idl_file( include, configurator, "_std_java.idl" ) ); - m_compilationTreeVector.addElement( add_idl_file( include, configurator, + m_compilationTreeVector.add( add_idl_file( include, configurator, "orb.idl" ) ); - m_compilationTreeVector.addElement( add_idl_file( include, configurator, + m_compilationTreeVector.add( add_idl_file( include, configurator, "_std_javax.idl" ) ); } @@ -402,21 +424,21 @@ * @param vect The vector with idl files to include. * @param include The vector with already compiled classes. */ - public void add_idl_files( Vector vect, Vector include ) + public void add_idl_files( final List vect, final List include ) { - int locSize = vect.size(); + final int locSize = vect.size(); IdlObject compilationGraph = null; - IdlParser idlparser = new IdlParser( m_rcp ); + final IdlParser idlparser = new IdlParser( m_rcp ); for ( int i = 0; i < locSize; i++ ) { - String idl_file_name = ( String ) vect.elementAt( i ); + final String idl_file_name = ( String ) vect.get( i ); display( "adding idl file " + idl_file_name ); try { compilationGraph = idlparser.compile_idl( idl_file_name ); } - catch ( FileNotFoundException e ) + catch ( final FileNotFoundException e ) { System.err.println( "Impossible to add " + idl_file_name + ":" + e.toString() ); } @@ -427,9 +449,10 @@ // Add to the graph compilation tree if ( compilationGraph != null ) { - m_compilationTreeVector.addElement( compilationGraph ); + m_compilationTreeVector.add( compilationGraph ); // Add as an include - MappingAPI m_api = new MappingAPI( m_rcp, m_ch, this ); + final MappingAPI m_api = new MappingAPI( m_rcp, m_ch, this ); + m_api.add_idl_object_as_first( m_idlTreeRoot, new IdlInclude( m_idlTreeRoot, idl_file_name.substring( 0, idl_file_name.lastIndexOf( '.' ) ) ) ); @@ -450,8 +473,8 @@ * @param idl_file_name The file name to include. * @return The tree as a result of parsing the file idl_file_name. */ - public IdlObject add_idl_file( Vector include, - org.openorb.compiler.orb.Configurator configurator, String idl_file_name ) + public IdlObject add_idl_file( final List include, final Configurator configurator, + final String idl_file_name ) { // -- Add RMI IDL Directory -- //String directory = configurator.getProperties().getStringProperty("compiler.idl.rmi", @@ -466,12 +489,12 @@ IdlObject compilationGraph = null; - IdlParser idlparser = new IdlParser( m_rcp ); + final IdlParser idlparser = new IdlParser( m_rcp ); try { compilationGraph = idlparser.compile_idl( idl_file_name ); } - catch ( FileNotFoundException e ) + catch ( final FileNotFoundException e ) { System.err.println( e.toString() ); } Index: MappingAPI.java =================================================================== RCS file: /cvsroot/openorb/OpenORB/src/compiler/org/openorb/compiler/rmi/parser/MappingAPI.java,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- MappingAPI.java 10 Feb 2004 21:02:41 -0000 1.15 +++ MappingAPI.java 28 Jul 2004 15:18:05 -0000 1.16 @@ -13,8 +13,17 @@ import java.lang.reflect.Method; import java.lang.reflect.Modifier; -import java.util.Hashtable; -import java.util.Vector; +import java.util.Map; +import java.util.HashMap; +import java.util.List; +import java.util.ArrayList; +import java.util.StringTokenizer; + [...1948 lines suppressed...] - private String process_special_changes( String name ) + private String process_special_changes( final String name ) { if ( name.equals( "java_lang_Class" ) ) { @@ -3483,10 +3642,11 @@ * @param idlObj The parent idl object * @param sub_idlObj The sub idl object to add to the parent */ - public void add_idl_object_as_first( IdlObject idlObj, - IdlObject sub_idlObj ) + public void add_idl_object_as_first( final IdlObject idlObj, + final IdlObject sub_idlObj ) { - display( "MappingAPI::add_idl_object_as_first" ); + display( "MappingAPI::add_idl_object_as_first((IdlObject)[", idlObj, + "], (IdlObject)[", sub_idlObj, "])" ); idlObj._list.insertElementAt( sub_idlObj, 0 ); } } |
|
From: Richard G C. <pim...@us...> - 2004-07-28 15:18:13
|
Update of /cvsroot/openorb/OpenORB/src/compiler/org/openorb/compiler/rmi/generator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29014/OpenORB/src/compiler/org/openorb/compiler/rmi/generator Modified Files: Javatoidl.java Log Message: refactoring + more verbose output Index: Javatoidl.java =================================================================== RCS file: /cvsroot/openorb/OpenORB/src/compiler/org/openorb/compiler/rmi/generator/Javatoidl.java,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- Javatoidl.java 13 Feb 2004 11:43:05 -0000 1.11 +++ Javatoidl.java 28 Jul 2004 15:18:05 -0000 1.12 @@ -110,12 +110,7 @@ m_rcp.getM_clistener().addTargetJavaFile( file ); } // -- Create sub directories -- - if ( file_name.indexOf( java.io.File.separator ) != -1 ) - { - String path = file_name.substring( 0, file_name.lastIndexOf( java.io.File.separator ) ); - java.io.File f = new java.io.File( path ); - f.mkdirs(); - } + file.getParentFile().mkdirs(); // -- Create the files -- java.io.PrintWriter printout = null; try |
|
From: Richard G C. <pim...@us...> - 2004-07-28 15:18:13
|
Update of /cvsroot/openorb/OpenORB/src/compiler/org/openorb/compiler/rmi In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29014/OpenORB/src/compiler/org/openorb/compiler/rmi Modified Files: JavaToIdl.java Log Message: refactoring + more verbose output Index: JavaToIdl.java =================================================================== RCS file: /cvsroot/openorb/OpenORB/src/compiler/org/openorb/compiler/rmi/JavaToIdl.java,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- JavaToIdl.java 5 May 2004 07:50:37 -0000 1.22 +++ JavaToIdl.java 28 Jul 2004 15:18:04 -0000 1.23 @@ -365,7 +365,7 @@ { compilationGraph = javaParser.parse_java( cl_name, true ); } - catch ( Throwable th ) + catch ( final Throwable th ) { m_ch.display( "An exception occured while parsing file: '" + cl_name + "'! (" + th + ")" ); @@ -401,9 +401,9 @@ for ( int i = locTaille; i < locSize; i++ ) { toIDL.translateToIDL( ( org.openorb.compiler.object.IdlRoot ) - javaParser.getCompilationTree().elementAt( i ), + javaParser.getCompilationTree().get( i ), ( ( org.openorb.compiler.object.IdlRoot ) - javaParser.getCompilationTree().elementAt( i ) )._name.replace( + javaParser.getCompilationTree().get( i ) )._name.replace( '.', java.io.File.separatorChar ) + ".idl" ); } } @@ -421,7 +421,7 @@ for ( int i = locTaille; i < locSize; i++ ) { toIDL.translateRMITie( ( org.openorb.compiler.object.IdlRoot ) - javaParser.getCompilationTree().elementAt( i ) ); + javaParser.getCompilationTree().get( i ) ); } } if ( rcp.getM_map_tie() ) @@ -446,7 +446,7 @@ for ( int i = locTaille; i < locSize; i++ ) { toIDL.translateRMIStub( ( org.openorb.compiler.object.IdlRoot ) - javaParser.getCompilationTree().elementAt( i ) ); + javaParser.getCompilationTree().get( i ) ); } } if ( rcp.getM_map_stub() ) |
|
From: Richard G C. <pim...@us...> - 2004-07-28 15:18:12
|
Update of /cvsroot/openorb/OpenORB/src/compiler/org/openorb/compiler/object In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29014/OpenORB/src/compiler/org/openorb/compiler/object Modified Files: IdlObject.java Log Message: refactoring + more verbose output Index: IdlObject.java =================================================================== RCS file: /cvsroot/openorb/OpenORB/src/compiler/org/openorb/compiler/object/IdlObject.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- IdlObject.java 10 Feb 2004 21:02:39 -0000 1.5 +++ IdlObject.java 28 Jul 2004 15:18:04 -0000 1.6 @@ -149,6 +149,11 @@ this( type, father, father.getParser() ); } + public String toString() + { + return getClass() + "{name=[" + idlName() + "], id=[" + idlID() + "]"; + } + public IdlParser getParser() { return m_parser; |
|
From: Michael R. <mr...@us...> - 2004-07-28 12:10:59
|
Update of /cvsroot/openorb/OpenORB In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31495/OpenORB Modified Files: WHATSNEW Log Message: Added items about the latest changes Index: WHATSNEW =================================================================== RCS file: /cvsroot/openorb/OpenORB/WHATSNEW,v retrieving revision 1.224 retrieving revision 1.225 diff -u -d -r1.224 -r1.225 --- WHATSNEW 23 Jul 2004 15:22:01 -0000 1.224 +++ WHATSNEW 28 Jul 2004 12:10:50 -0000 1.225 @@ -1,6 +1,28 @@ OpenORB ------- +- Always use the native library on AIX with VM 1.4.x. + +- When setting the property UtilDelegateImpl.setLocalCodebaseOnly(true) + we don't want any RMIClassloader to attempt to load the class. + In normal projects client and server side contain the classes + that are necessary for marshaling/unmarshaling the transfered + types. I have never seen a project where classes are loaded + dynamically from a remote location. Though the UtilDelegateImpl + wastes a lot of time trying to load a class using the RMIClassloader. + The reason is simply standard compliance because the Java2IDL + spec. requires exactly this behaviour. The default behaviour of + the method UtilDelegateImpl.loadClass() is the standard compliant. + With the property mentioned above the costly class loader operations + can be skipped. + +- Added an optimization to ORB.lookup_value_factory(). This method + always perfoms expensive lookups although it should never be used + for any RMI type. + +- Wrapped an unmarshalling call into a PriviledgedAction to make + it work even in restricted environments. + - Started adding a time measurement wrapper around test cases to be able to detect hanging or long running test cases. |
2 messages has been excluded from this view by a project administrator.
