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-28 12:10:34
|
Update of /cvsroot/openorb/OpenORB/src/main/org/openorb/orb/rmi In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31268/OpenORB/src/main/org/openorb/orb/rmi Modified Files: UtilDelegateImpl.java Log Message: Also avoid the second RMIClassLoader.loadClass() attempt when the property useLocalCodebase only Index: UtilDelegateImpl.java =================================================================== RCS file: /cvsroot/openorb/OpenORB/src/main/org/openorb/orb/rmi/UtilDelegateImpl.java,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- UtilDelegateImpl.java 20 Jul 2004 07:22:41 -0000 1.9 +++ UtilDelegateImpl.java 28 Jul 2004 12:10:25 -0000 1.10 @@ -1161,18 +1161,17 @@ { // 1. Find the first non-null ClassLoader on the call stack and attempt to // load the class using this ClassLoader. - // NOTE: The JDK uses a native method to loop through the call stack + // TODO: The JDK uses a native method to loop through the call stack // It gets each method, the class the method is defined for, and the // corresponding class loader. If a non-null class loader is found then // this instance is returned, otherwise NULL is returned. - // After analyzing the Sun JDK source code it seems as if the - // implementation here is not correct. Sun uses the class JDKClassLoader - // which makes the ObjectInputStream's private native method - // latestUserDefinedLoader accessible via reflection. - // (IBM JDK: ???) + // It seems as if this implementation is not correct. + // Sun JDK: Uses JDKClassLoader makes the ObjectInputStream's private native + // method latestUserDefinedLoader accessible via reflection. + // IBM JDK: ??? try { - return Thread.currentThread().getContextClassLoader().loadClass( className ); + return Class.forName( className, false, null ); } catch ( ClassNotFoundException ex ) { @@ -1212,29 +1211,32 @@ } } - // 3. If remoteCodebase is null or useCodebaseOnly is true, then call + // 3. If remoteCodebase is null or localCodebaseOnly is false, then call // java.rmi.server.RMIClassLoader.loadClass(null, className) - try - { - return java.rmi.server.RMIClassLoader.loadClass( ( String ) null, className ); - } - catch ( ClassNotFoundException ex ) + if ( !s_local_codebase_only ) { - if ( getLogger().isDebugEnabled() && Trace.isMedium() ) + try { - getLogger().debug( "Attempt (3) to load the class via the RMIClassLoader" - + " failed as well." ); + return java.rmi.server.RMIClassLoader.loadClass( ( String ) null, className ); } - // try other ways below... - } - catch ( java.net.MalformedURLException ex ) - { - if ( getLogger().isDebugEnabled() && Trace.isMedium() ) + catch ( ClassNotFoundException ex ) { - getLogger().debug( "Attempt (3) to load the class via the RMIClassLoader" - + " failed as well." ); + if ( getLogger().isDebugEnabled() && Trace.isMedium() ) + { + getLogger().debug( "Attempt (3) to load the class via the RMIClassLoader" + + " failed as well." ); + } + // try other ways below... + } + catch ( java.net.MalformedURLException ex ) + { + if ( getLogger().isDebugEnabled() && Trace.isMedium() ) + { + getLogger().debug( "Attempt (3) to load the class via the RMIClassLoader" + + " failed as well." ); + } + // try other ways below... } - // try other ways below... } // 4. If a class was not successfully loaded by step 1, 2, or 3, and loader is non-null, |
|
From: Michael R. <mr...@us...> - 2004-07-28 12:08:51
|
Update of /cvsroot/openorb/OpenORB/src/main/org/openorb/orb/rmi In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30960/OpenORB/src/main/org/openorb/orb/rmi Modified Files: DeserializationKernelFactory.java Log Message: On AIX with JDK 1.4.x always try to use the native library any other option does not work Index: DeserializationKernelFactory.java =================================================================== RCS file: /cvsroot/openorb/OpenORB/src/main/org/openorb/orb/rmi/DeserializationKernelFactory.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- DeserializationKernelFactory.java 19 Feb 2004 07:21:32 -0000 1.6 +++ DeserializationKernelFactory.java 28 Jul 2004 12:08:42 -0000 1.7 @@ -18,6 +18,10 @@ * <ul> * <li>Windows 2000, JDK 1.3.1 * <li>Windows 2000, JDK 1.3.0 + * <li>AIX 5.2, JDK 1.4.2 + * <li>AIX 5.2, JDK 1.4.1 + * <li>AIX 5.2, JDK 1.3.1 + * <li>AIX 5.1, JDK 1.3.1 * <li>AIX 4.3, JDK 1.3.1 * <li>AIX 4.3, JDK 1.3.0 * <li>Linux, JDK 1.3.1 @@ -128,15 +132,29 @@ if ( s_kernel == null ) { - try + // The following check is not working under AIX JDK version 1.4.x + // so don'teven try it instead give the following checks a chance + // to succeed + final String os_name = System.getProperty( "os.name" ); + final String vm_version = System.getProperty( "java.vm.version" ); + if ( !os_name.equalsIgnoreCase( "AIX" ) + || !vm_version.startsWith( "1.4." ) ) { - Thread.currentThread().getContextClassLoader().loadClass( - "com.ibm.rmi.io.PureReflectField" ); - s_kernel = new DeserializationKernelIBM14(); + try + { + Thread.currentThread().getContextClassLoader().loadClass( + "com.ibm.rmi.io.PureReflectField" ); + s_kernel = new DeserializationKernelIBM14(); + } + catch ( ClassNotFoundException ex ) + { + // no valid IBM JDK 1.4.x + } } - catch ( ClassNotFoundException ex ) + else { - // no IBM JDK 1.4.x + // This is the broken version + s_kernel = new DeserializationKernelNative(); } } @@ -148,7 +166,7 @@ { try { - Class clz = Class.forName( "<UNIQUE CLASS FOR VOM OF VENDOR XYZ>" ); + Class clz = Class.forName( "<UNIQUE CLASS FOR VM OF VENDOR XYZ>" ); // This class needs to be implemented for each JDK //s_kernel = new DeserializationKernelXYZ(); } |
|
From: Michael R. <mr...@us...> - 2004-07-28 12:08:02
|
Update of /cvsroot/openorb/OpenORB/src/main/org/openorb/orb/iiop In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30808/OpenORB/src/main/org/openorb/orb/iiop Modified Files: CDRInputStream.java Log Message: Wrap the readValue call in a PriviledgedAction Index: CDRInputStream.java =================================================================== RCS file: /cvsroot/openorb/OpenORB/src/main/org/openorb/orb/iiop/CDRInputStream.java,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- CDRInputStream.java 13 May 2004 04:09:26 -0000 1.19 +++ CDRInputStream.java 28 Jul 2004 12:07:51 -0000 1.20 @@ -2558,13 +2558,11 @@ private java.io.Serializable read_value_withtype( String repo_id, String codeBase, Class clz ) { org.omg.CORBA.portable.ValueFactory factory = - ( ( org.omg.CORBA_2_3.ORB ) m_orb ).lookup_value_factory( repo_id ); - + ( ( org.omg.CORBA_2_3.ORB ) m_orb ).lookup_value_factory( repo_id ); if ( factory != null ) { return factory.read_value( this ); } - java.io.Serializable ret; // try extended unmarshal // _value_indirect will eventually be modified in the recursive call to @@ -2572,10 +2570,10 @@ // for later. int temp = m_value_indirect; - ret = value_extended_unmarshal( m_value_indirect, clz, repo_id, codeBase, null ); + java.io.Serializable ret = + value_extended_unmarshal( m_value_indirect, clz, repo_id, codeBase, null ); if ( ret != null ) { - // Use local variable to store current object in indirection table. m_value_cache.put( NumberCache.getInteger( temp ), ret ); return ret; @@ -2651,14 +2649,24 @@ * calls to this function with an offset equal to a previous value must * not unmarshal from the stream. */ - protected java.io.Serializable value_extended_unmarshal( int offset, Class clz, - String repo_id, String codeBase, RunTime sendingCtxt ) + protected java.io.Serializable value_extended_unmarshal( final int offset, final Class clz, + final String repo_id, final String codeBase, final RunTime sendingCtxt ) { java.io.Serializable result = null; if ( repo_id.startsWith( "RMI:" ) ) { m_code_base = codeBase; - result = s_handler.readValue( this, offset, clz, repo_id, sendingCtxt ); + final CDRInputStream thisStream = this; + + result = (java.io.Serializable) java.security.AccessController.doPrivileged( + new java.security.PrivilegedAction () + { + public Object run () + { + return s_handler.readValue( thisStream, offset, clz, repo_id, + sendingCtxt ); + } + } ); } return result; } |
|
From: Michael R. <mr...@us...> - 2004-07-28 12:07:21
|
Update of /cvsroot/openorb/OpenORB/src/main/org/openorb/orb/core In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30667/OpenORB/src/main/org/openorb/orb/core Modified Files: ORB.java Log Message: Do not perform a lookup_value_factory for RMI types Index: ORB.java =================================================================== RCS file: /cvsroot/openorb/OpenORB/src/main/org/openorb/orb/core/ORB.java,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- ORB.java 21 Jul 2004 11:24:51 -0000 1.26 +++ ORB.java 28 Jul 2004 12:06:53 -0000 1.27 @@ -490,7 +490,7 @@ if ( null != mapped ) { reference = NamingUtils.resolveObjectFromNamingService( this, mapped, - object_name.equals( NamingUtils.NS_NAME_LONG ), getLogger() ); + object_name.equals( NamingUtils.NS_NAME_LONG ) ); } else { @@ -1265,59 +1265,64 @@ /** * This function is used to find a value factory. * - * @param id - * @return ValueFactory + * @param id The type id of the value type. + * @return ValueFactory The value factory if one was found, or null otherwise. */ public org.omg.CORBA.portable.ValueFactory lookup_value_factory( String id ) { - org.omg.CORBA.portable.ValueFactory ret; - synchronized ( m_sync_state ) + // Looking for a RMI type factory is _very_ unusual + org.omg.CORBA.portable.ValueFactory ret = null; + if ( !id.startsWith( "RMI:" ) ) { - Map factories = ( Map ) getFeature( "ValueFactory" ); - if ( factories != null ) + synchronized ( m_sync_state ) { - ret = ( org.omg.CORBA.portable.ValueFactory ) factories.get( id ); - if ( ret != null ) + Map factories = ( Map ) getFeature( "ValueFactory" ); + if ( factories != null ) { - return ret; + ret = ( org.omg.CORBA.portable.ValueFactory ) factories.get( id ); + if ( ret != null ) + { + return ret; + } } } - } - - // load the default factory if it can be found - String classname; - try - { - classname = RepoIDHelper.idToClass( id, RepoIDHelper.TYPE_DEFAULT_FACTORY ); - } - catch ( final IllegalArgumentException ex ) - { - return null; - } - Class clz = null; - if ( classname != null ) - { + // load the default factory if it can be found + String classname; try { - clz = Thread.currentThread().getContextClassLoader().loadClass( classname ); + classname = RepoIDHelper.idToClass( id, RepoIDHelper.TYPE_DEFAULT_FACTORY ); } - catch ( final Throwable ex ) + catch ( final IllegalArgumentException ex ) { return null; } - } - try - { - return ( org.omg.CORBA.portable.ValueFactory ) clz.newInstance(); - } - catch ( final Exception ex ) - { - final String error = "Default value factory for '" - + classname + "' raised a instantiation error."; - throw new ORBRuntimeException( error, ex ); + Class clz = null; + if ( classname != null ) + { + try + { + clz = Thread.currentThread().getContextClassLoader().loadClass( classname ); + } + catch ( final Throwable ex ) + { + return null; + } + } + + try + { + ret = ( org.omg.CORBA.portable.ValueFactory ) clz.newInstance(); + } + catch ( final Exception ex ) + { + final String error = "Default value factory for '" + + classname + "' raised a instantiation error."; + throw new ORBRuntimeException( error, ex ); + } } + return ret; } /** |
|
From: Michael R. <mr...@us...> - 2004-07-27 15:28:42
|
Update of /cvsroot/openorb/tools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16789/tools Modified Files: .classpath Log Message: Added hsqldb.jar to the tools project classpath Index: .classpath =================================================================== RCS file: /cvsroot/openorb/tools/.classpath,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- .classpath 2 Feb 2004 23:14:56 -0000 1.1 +++ .classpath 27 Jul 2004 15:28:33 -0000 1.2 @@ -27,5 +27,6 @@ <classpathentry kind="lib" path="docbook/xsl/extensions/saxon651.jar"/> <classpathentry kind="lib" path="lib/ext/build/xalan.jar"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="lib" path="lib/ext/hsqldb.jar"/> <classpathentry kind="output" path="build/main"/> </classpath> |
|
From: Michael R. <mr...@us...> - 2004-07-27 13:12:46
|
Update of /cvsroot/openorb/TransactionService/src/examples/org/openorb/ots/examples/xa In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23080/src/examples/org/openorb/ots/examples/xa Modified Files: BankImpl.java Removed Files: .cvsignore bank.prp Log Message: Switched from InstantDB to HSQLDB. Adapted all examples to the new database. Index: BankImpl.java =================================================================== RCS file: /cvsroot/openorb/TransactionService/src/examples/org/openorb/ots/examples/xa/BankImpl.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- BankImpl.java 10 Feb 2004 21:26:47 -0000 1.2 +++ BankImpl.java 27 Jul 2004 13:12:37 -0000 1.3 @@ -97,7 +97,7 @@ "TransactionSessionManager" ); org.openorb.ots.SessionManager session = org.openorb.ots.SessionManagerHelper.narrow( obj ); - m_db = session.getConnection( null, null, "InstantDB" ); + m_db = session.getConnection( null, null, "HSQLDB" ); } catch ( java.lang.Exception ex ) { --- .cvsignore DELETED --- --- bank.prp DELETED --- |
|
From: Michael R. <mr...@us...> - 2004-07-27 13:12:46
|
Update of /cvsroot/openorb/TransactionService/src/main/org/openorb/ots/xa In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23080/src/main/org/openorb/ots/xa Modified Files: SessionManager.java XAVirtualDataSource.java Log Message: Switched from InstantDB to HSQLDB. Adapted all examples to the new database. Index: SessionManager.java =================================================================== RCS file: /cvsroot/openorb/TransactionService/src/main/org/openorb/ots/xa/SessionManager.java,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- SessionManager.java 4 Jun 2004 10:32:17 -0000 1.15 +++ SessionManager.java 27 Jul 2004 13:12:37 -0000 1.16 @@ -73,7 +73,6 @@ /** * Return a new database connection for the user */ - public synchronized java.sql.Connection getConnection( String name, String password, String profile ) { Index: XAVirtualDataSource.java =================================================================== RCS file: /cvsroot/openorb/TransactionService/src/main/org/openorb/ots/xa/XAVirtualDataSource.java,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- XAVirtualDataSource.java 4 Jun 2004 10:32:18 -0000 1.10 +++ XAVirtualDataSource.java 27 Jul 2004 13:12:37 -0000 1.11 @@ -121,28 +121,7 @@ */ public javax.sql.XAConnection getXAConnection() throws java.sql.SQLException { - org.openorb.orb.config.ORBLoader cfg = ( ( org.openorb.orb.core.ORB ) m_orb ).getLoader(); - String user_name = null; - String user_password = null; - try - { - user_name = cfg.getStringProperty( "OTS.Database.User" ); - user_password = cfg.getStringProperty( "OTS.Database.Password" ); - } - catch ( org.openorb.orb.config.PropertyNotFoundException pnf ) - { - getLogger().error( "Unable to find OTS.Database.User or Password property, " - + "trying with empty string", pnf ); - } - if ( user_name == null ) - { - user_name = ""; - } - if ( user_password == null ) - { - user_password = ""; - } - return getXAConnection( user_name, user_password ); + return getXAConnection( null, null ); } /** @@ -152,32 +131,55 @@ public javax.sql.XAConnection getXAConnection( String user, String password ) throws java.sql.SQLException { + org.openorb.orb.config.ORBLoader cfg = ( ( org.openorb.orb.core.ORB ) m_orb ).getLoader(); // // Create a new database connection // java.sql.Connection connection = null; + String user_name = user; + String user_password = password; + try + { + if ( user == null ) + { + user_name = cfg.getStringProperty( "OTS.Database.User" ); + } + if ( password == null ) + { + user_password = cfg.getStringProperty( "OTS.Database.Password" ); + } + } + catch ( org.openorb.orb.config.PropertyNotFoundException pnf ) + { + getLogger().warn( "Unable to find OTS.Database.User or Password property, " + + "trying with empty string" ); + } + // // Check name and password // if ( user == null ) { - user = ""; + user_name = ""; } if ( password == null ) { - password = ""; + user_password = ""; } // // Use the jdbc driver to get access to the database // - if ( user.length() == 0 || password.length() == 0 ) + if ( user_name.length() == 0 && user_password.length() == 0 ) { connection = java.sql.DriverManager.getConnection( m_jdbc_url ); } else { - connection = java.sql.DriverManager.getConnection( m_jdbc_url, user, password ); + getLogger().debug( "getConnection(" + m_jdbc_url + ", " + user_name + ", " + + user_password + ")" ); + connection = java.sql.DriverManager.getConnection( m_jdbc_url, user_name, + user_password ); } // // Set the DataSource meta data |
|
From: Michael R. <mr...@us...> - 2004-07-27 13:12:46
|
Update of /cvsroot/openorb/TransactionService/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23080/src Modified Files: build.xml Log Message: Switched from InstantDB to HSQLDB. Adapted all examples to the new database. Index: build.xml =================================================================== RCS file: /cvsroot/openorb/TransactionService/src/build.xml,v retrieving revision 1.63 retrieving revision 1.64 diff -u -d -r1.63 -r1.64 --- build.xml 23 Jul 2004 09:49:36 -0000 1.63 +++ build.xml 27 Jul 2004 13:12:37 -0000 1.64 @@ -828,12 +828,6 @@ tofile="${bin}/WHATSNEW" /> <copy file="${basedir}/setenv" tofile="${bin}/setenv" /> - <copy file="${basedir}/InstantDB_LICENSE.txt" - tofile="${bin}/InstantDB_LICENSE.txt" /> - <copy file="${basedir}/InstantDB_OPL.html" - tofile="${bin}/InstantDB_OPL.html" /> - <copy file="${basedir}/InstantDB_EPL.html" - tofile="${bin}/InstantDB_EPL.html" /> <chmod dir="${bin}" perm="ugo+rx" includes="setenv"/> <copy todir="${bin}/bin" > |
|
From: Michael R. <mr...@us...> - 2004-07-27 13:12:46
|
Update of /cvsroot/openorb/TransactionService In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23080 Modified Files: .classpath .cvsignore TODO WHATSNEW Removed Files: InstantDB_EPL.html InstantDB_LICENSE.txt InstantDB_OPL.html Log Message: Switched from InstantDB to HSQLDB. Adapted all examples to the new database. Index: .classpath =================================================================== RCS file: /cvsroot/openorb/TransactionService/.classpath,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- .classpath 2 Feb 2004 23:14:21 -0000 1.1 +++ .classpath 27 Jul 2004 13:12:35 -0000 1.2 @@ -8,7 +8,6 @@ <classpathentry kind="lib" path="lib/ext/savepoint.jar"/> <classpathentry kind="lib" path="lib/openorb_ots-1.4.0.jar"/> <classpathentry kind="lib" path="lib/ext/jta_1.0.1.jar"/> - <classpathentry kind="lib" path="lib/ext/idb.jar"/> <classpathentry kind="lib" path="lib/openorb_ots_examples-1.4.0.jar"/> <classpathentry kind="lib" path="lib/ext/jdbc.jar"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> Index: .cvsignore =================================================================== RCS file: /cvsroot/openorb/TransactionService/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- .cvsignore 2 Feb 2004 23:14:20 -0000 1.6 +++ .cvsignore 27 Jul 2004 13:12:35 -0000 1.7 @@ -3,8 +3,9 @@ dist doc local.properties +ObjectId orb.log *.cache .classpath .project - +*.hsqldb.* Index: TODO =================================================================== RCS file: /cvsroot/openorb/TransactionService/TODO,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- TODO 11 Mar 2003 13:59:35 -0000 1.8 +++ TODO 27 Jul 2004 13:12:36 -0000 1.9 @@ -2,6 +2,3 @@ Transaction Service TODO ======================================= -- Make the example load the bank.prp property file from the examples - jar. - Index: WHATSNEW =================================================================== RCS file: /cvsroot/openorb/TransactionService/WHATSNEW,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- WHATSNEW 26 Jul 2004 12:04:39 -0000 1.35 +++ WHATSNEW 27 Jul 2004 13:12:36 -0000 1.36 @@ -1,6 +1,8 @@ OpenORB 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). --- InstantDB_EPL.html DELETED --- --- InstantDB_LICENSE.txt DELETED --- --- InstantDB_OPL.html DELETED --- |
|
From: Michael R. <mr...@us...> - 2004-07-27 13:12:46
|
Update of /cvsroot/openorb/TransactionService/lib/ext In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23080/lib/ext Removed Files: idb.jar Log Message: Switched from InstantDB to HSQLDB. Adapted all examples to the new database. --- idb.jar DELETED --- |
|
From: Michael R. <mr...@us...> - 2004-07-27 13:12:46
|
Update of /cvsroot/openorb/TransactionService/src/config In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23080/src/config Modified Files: ots.xml Log Message: Switched from InstantDB to HSQLDB. Adapted all examples to the new database. Index: ots.xml =================================================================== RCS file: /cvsroot/openorb/TransactionService/src/config/ots.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- ots.xml 28 Feb 2003 14:27:44 -0000 1.4 +++ ots.xml 27 Jul 2004 13:12:37 -0000 1.5 @@ -11,12 +11,15 @@ xmlns:xlink="http://www.w3.org/1999/xlink" > <module name="ots" initializer="org.openorb.ots.Initializer" > - <!-- Properties for the XA example using an Instant DB database --> - <property name="InstantDB.XA.VirtualXA" value="true" root="true" /> - <property name="InstantDB.JDBC.driver_loading" value="true" root="true" /> - <property name="InstantDB.JDBC.driver" value="org.enhydra.instantdb.jdbc.idbDriver" root="true" /> - <property name="InstantDB.JDBC.isolation_level" value="4" root="true" /> - <property name="InstantDB.JDBC.url" value="jdbc:idb:bank.prp" root="true" /> + <!-- Properties for the XA example using the HSQLDB database --> + <property name="HSQLDB.XA.VirtualXA" value="true" root="true" /> + <property name="HSQLDB.JDBC.driver_loading" value="true" root="true" /> + <property name="HSQLDB.JDBC.driver" value="org.hsqldb.jdbcDriver" root="true" /> + <property name="HSQLDB.JDBC.url" value="jdbc:hsqldb:bank.hsqldb" root="true" /> + + <property name="OTS.Database.LoginTimeout" value="60" root="true" /> + <property name="OTS.Database.User" value="" root="true" /> + <property name="OTS.Database.Password" value="" root="true" /> </module> </OpenORB> |
|
From: Michael R. <mr...@us...> - 2004-07-27 12:22:50
|
Update of /cvsroot/openorb/ManagementBoard/src/main/org/openorb/board/shared/util In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14743/ManagementBoard/src/main/org/openorb/board/shared/util Modified Files: XMLTools.java Log Message: As long as we still support JDK 1.3.x we can't switch to the javax.xml API Index: XMLTools.java =================================================================== RCS file: /cvsroot/openorb/ManagementBoard/src/main/org/openorb/board/shared/util/XMLTools.java,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- XMLTools.java 10 Feb 2004 21:12:19 -0000 1.11 +++ XMLTools.java 27 Jul 2004 12:22:41 -0000 1.12 @@ -10,6 +10,11 @@ import java.util.Vector; import java.util.StringTokenizer; + +// >JDK 1.4 only +//import javax.xml.parsers.DocumentBuilder; +//import javax.xml.parsers.DocumentBuilderFactory; + import org.w3c.dom.Node; import org.w3c.dom.NodeList; import org.w3c.dom.Document; @@ -38,8 +43,6 @@ */ public XMLTools( java.io.InputStream input ) { - // TODO: use jaxp here instead of hardcoding the parser! - // Xerces parser org.apache.xerces.parsers.DOMParser parser = new org.apache.xerces.parsers.DOMParser(); @@ -47,11 +50,7 @@ { parser.parse( new org.xml.sax.InputSource( input ) ); } - catch ( org.xml.sax.SAXException ex ) - { - // TODO: ??? - } - catch ( java.io.IOException ex ) + catch ( Exception ex ) { // TODO: ??? } @@ -60,6 +59,20 @@ // The root element of the document m_rootNode = doc.getDocumentElement(); + +/* // >JDK 1.4 only + try + { + final DocumentBuilder db = DocumentBuilderFactory.newInstance().newDocumentBuilder(); + Document doc = db.parse( new org.xml.sax.InputSource( input ) ); + m_rootNode = doc.getDocumentElement(); + } + catch ( Exception ex ) + { + // TODO + ex.printStackTrace(); + } +*/ } /** |
|
From: Michael R. <mr...@us...> - 2004-07-27 09:36:08
|
Update of /cvsroot/openorb/PersistentStateService In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19370 Modified Files: TODO Log Message: Removed the HSQLDB task from the TODO list Index: TODO =================================================================== RCS file: /cvsroot/openorb/PersistentStateService/TODO,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- TODO 26 Jul 2004 16:27:44 -0000 1.8 +++ TODO 27 Jul 2004 09:35:58 -0000 1.9 @@ -10,7 +10,3 @@ /tmp/OpenORB/PSS/<app-id> !? ~/.OpenORB For the precise order, see the Service framework. - -- Use HSQLDB for database examples. - IDB has changed its license to a proprietary one - and the old IDB does not seem to allow long table names. |
|
From: Michael R. <mr...@us...> - 2004-07-27 09:17:08
|
Update of /cvsroot/openorb/PersistentStateService In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16711 Modified Files: WHATSNEW Log Message: Fixed all examples Index: WHATSNEW =================================================================== RCS file: /cvsroot/openorb/PersistentStateService/WHATSNEW,v retrieving revision 1.37 retrieving revision 1.38 diff -u -d -r1.37 -r1.38 --- WHATSNEW 26 Jul 2004 16:27:44 -0000 1.37 +++ WHATSNEW 27 Jul 2004 09:16:29 -0000 1.38 @@ -2,9 +2,9 @@ ------------------------------ - Fixed examples: org.openorb.pss.examples. - memory.basic.* - file.basic.* - database.basic.* (table names too long for IDB) + 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. |
|
From: Michael R. <mr...@us...> - 2004-07-27 09:16:45
|
Update of /cvsroot/openorb/PersistentStateService/src/examples/org/openorb/pss/examples/file/transactional/second In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16711/src/examples/org/openorb/pss/examples/file/transactional/second Modified Files: Client.java MyCatalogImpl.java PersonBaseImpl.java Server.java Log Message: Fixed all examples Index: Client.java =================================================================== RCS file: /cvsroot/openorb/PersistentStateService/src/examples/org/openorb/pss/examples/file/transactional/second/Client.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Client.java 23 Jul 2004 23:11:57 -0000 1.2 +++ Client.java 27 Jul 2004 09:16:35 -0000 1.3 @@ -35,7 +35,6 @@ String stringTarget = reader.readLine(); obj = s_orb.string_to_object( stringTarget ); - } catch ( java.io.IOException ex ) { @@ -43,8 +42,6 @@ System.exit( 0 ); } - - // 3. // Narrow the object reference s_form = FormHelper.narrow( obj ); Index: MyCatalogImpl.java =================================================================== RCS file: /cvsroot/openorb/PersistentStateService/src/examples/org/openorb/pss/examples/file/transactional/second/MyCatalogImpl.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- MyCatalogImpl.java 25 Mar 2003 08:45:33 -0000 1.1 +++ MyCatalogImpl.java 27 Jul 2004 09:16:35 -0000 1.2 @@ -15,7 +15,8 @@ { try { - return ( CarHome ) find_storage_home( "PSDL:CarHomeBase:1.0" ); + return ( CarHome ) find_storage_home( + "PSDL:org/openorb/pss/examples/file/transactional/second/CarHomeBase:1.0" ); } catch ( org.omg.CosPersistentState.NotFound ex ) { @@ -27,7 +28,8 @@ { try { - return ( PersonHome ) find_storage_home( "PSDL:PersonHomeBase:1.0" ); + return ( PersonHome ) find_storage_home( + "PSDL:org/openorb/pss/examples/file/transactional/second/PersonHomeBase:1.0" ); } catch ( org.omg.CosPersistentState.NotFound ex ) { Index: PersonBaseImpl.java =================================================================== RCS file: /cvsroot/openorb/PersistentStateService/src/examples/org/openorb/pss/examples/file/transactional/second/PersonBaseImpl.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- PersonBaseImpl.java 25 Mar 2003 08:45:33 -0000 1.1 +++ PersonBaseImpl.java 27 Jul 2004 09:16:35 -0000 1.2 @@ -16,42 +16,42 @@ // public void print() { - System.out.println( "My name is : " + name() ); + System.out.println( "My name is : " + name() ); if ( ownCar() ) { - System.out.println( "I have a car : " ); + System.out.println( "I have a car : " ); Car my_car = car(); - System.out.println( "Car trademake : " + my_car.trademark() ); - System.out.println( "Car name : " + my_car.name() ); + System.out.println( "Car trademark : " + my_car.trademark() ); + System.out.println( "Car name : " + my_car.name() ); - System.out.print( "Car color : " ); + System.out.print( "Car color : " ); switch ( my_car.color().value() ) { - case Color._blue : - System.out.println( "blue" ); - break; + case Color._blue : + System.out.println( "blue" ); + break; - case Color._white : - System.out.println( "white" ); - break; + case Color._white : + System.out.println( "white" ); + break; - case Color._red : - System.out.println( "red" ); - break; + case Color._red : + System.out.println( "red" ); + break; - case Color._green : - System.out.println( "green" ); - break; + case Color._green : + System.out.println( "green" ); + break; } } else { - System.out.println( "I have'nt got a car :-(" ); + System.out.println( "I have no car :-(" ); } } @@ -60,11 +60,7 @@ // public boolean ownCar() { - if ( car( org.omg.CosPersistentState.YieldRef.YIELD_REF ) == null ) - { - return false; - } - return true; + return ( car( org.omg.CosPersistentState.YieldRef.YIELD_REF ) != null ); } } Index: Server.java =================================================================== RCS file: /cvsroot/openorb/PersistentStateService/src/examples/org/openorb/pss/examples/file/transactional/second/Server.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Server.java 23 Jul 2004 23:11:57 -0000 1.3 +++ Server.java 27 Jul 2004 09:16:35 -0000 1.4 @@ -15,6 +15,9 @@ */ public static void main( String [] args ) { + org.openorb.ots.Verbose.enable( null ); + org.openorb.pss.util.debug.debugMode( true ); + java.util.Properties props = new java.util.Properties(); props.put( "ImportModule.PSS", "${openorb.home}config/pss.xml#pss" ); props.put( "openorb.profile", "ots" ); @@ -38,31 +41,31 @@ connector.register_session_factory( "PSDL:org/openorb/pss/examples/file/transactional/second/MyCatalog:1.0", Thread.currentThread().getContextClassLoader().loadClass( - "org.openorb.pss.examples.file.transactional.second.MyCatalogImpl" ) ); + "org.openorb.pss.examples.file.transactional.second.MyCatalogImpl" ) ); // Register the person storage type factory connector.register_storage_object_factory( "PSDL:org/openorb/pss/examples/file/transactional/second/PersonBase:1.0", Thread.currentThread().getContextClassLoader().loadClass( - "org.openorb.pss.examples.file.transactional.second.PersonBaseImpl" ) ); + "org.openorb.pss.examples.file.transactional.second.PersonBaseImpl" ) ); // Register the person storage home factory connector.register_storage_home_factory( "PSDL:org/openorb/pss/examples/file/transactional/second/PersonHomeBase:1.0", Thread.currentThread().getContextClassLoader().loadClass( - "org.openorb.pss.examples.file.transactional.second.PersonHomeBase" ) ); + "org.openorb.pss.examples.file.transactional.second.PersonHomeBase" ) ); // Register the car storage type factory connector.register_storage_object_factory( "PSDL:org/openorb/pss/examples/file/transactional/second/CarBase:1.0", Thread.currentThread().getContextClassLoader().loadClass( - "org.openorb.pss.examples.file.transactional.second.CarBase" ) ); + "org.openorb.pss.examples.file.transactional.second.CarBase" ) ); // Register the car storage home factory connector.register_storage_home_factory( "PSDL:org/openorb/pss/examples/file/transactional/second/CarHomeBase:1.0", Thread.currentThread().getContextClassLoader().loadClass( - "org.openorb.pss.examples.file.transactional.second.CarHomeBase" ) ); + "org.openorb.pss.examples.file.transactional.second.CarHomeBase" ) ); // And now get the session access org.omg.CosPersistentState.Session mySession = null; |
|
From: Michael R. <mr...@us...> - 2004-07-27 09:16:45
|
Update of /cvsroot/openorb/PersistentStateService/src/examples/org/openorb/pss/examples/memory/transactional/second In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16711/src/examples/org/openorb/pss/examples/memory/transactional/second Modified Files: MyCatalogImpl.java PersonBaseImpl.java Server.java Log Message: Fixed all examples Index: MyCatalogImpl.java =================================================================== RCS file: /cvsroot/openorb/PersistentStateService/src/examples/org/openorb/pss/examples/memory/transactional/second/MyCatalogImpl.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- MyCatalogImpl.java 25 Mar 2003 08:45:35 -0000 1.1 +++ MyCatalogImpl.java 27 Jul 2004 09:16:35 -0000 1.2 @@ -15,7 +15,8 @@ { try { - return ( CarHome ) find_storage_home( "PSDL:CarHomeBase:1.0" ); + return ( CarHome ) find_storage_home( + "PSDL:org/openorb/pss/examples/memory/transactional/second/CarHomeBase:1.0" ); } catch ( org.omg.CosPersistentState.NotFound ex ) { @@ -27,7 +28,8 @@ { try { - return ( PersonHome ) find_storage_home( "PSDL:PersonHomeBase:1.0" ); + return ( PersonHome ) find_storage_home( + "PSDL:org/openorb/pss/examples/memory/transactional/second/PersonHomeBase:1.0" ); } catch ( org.omg.CosPersistentState.NotFound ex ) { Index: PersonBaseImpl.java =================================================================== RCS file: /cvsroot/openorb/PersistentStateService/src/examples/org/openorb/pss/examples/memory/transactional/second/PersonBaseImpl.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- PersonBaseImpl.java 25 Mar 2003 08:45:35 -0000 1.1 +++ PersonBaseImpl.java 27 Jul 2004 09:16:35 -0000 1.2 @@ -22,32 +22,33 @@ System.out.println( "I have a car : " ); Car my_car = car(); + if ( my_car != null ) + { + System.out.println( "Car trademark : " + my_car.trademark() ); + System.out.println( "Car name : " + my_car.name() ); - System.out.println( "Car trademake : " + my_car.trademark() ); - System.out.println( "Car name : " + my_car.name() ); - - System.out.print( "Car color : " ); + System.out.print( "Car color : " ); - switch ( my_car.color().value() ) - { + switch ( my_car.color().value() ) + { - case Color._blue : - System.out.println( "blue" ); - break; + case Color._blue : + System.out.println( "blue" ); + break; - case Color._white : - System.out.println( "white" ); - break; + case Color._white : + System.out.println( "white" ); + break; - case Color._red : - System.out.println( "red" ); - break; + case Color._red : + System.out.println( "red" ); + break; - case Color._green : - System.out.println( "green" ); - break; + case Color._green : + System.out.println( "green" ); + break; + } } - } else { Index: Server.java =================================================================== RCS file: /cvsroot/openorb/PersistentStateService/src/examples/org/openorb/pss/examples/memory/transactional/second/Server.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Server.java 23 Jul 2004 23:11:57 -0000 1.3 +++ Server.java 27 Jul 2004 09:16:35 -0000 1.4 @@ -15,6 +15,9 @@ */ public static void main( String [] args ) { + org.openorb.ots.Verbose.enable( null ); + org.openorb.pss.util.debug.debugMode( true ); + java.util.Properties props = new java.util.Properties(); props.put( "ImportModule.PSS", "${openorb.home}config/pss.xml#pss" ); props.put( "openorb.profile", "ots" ); @@ -38,31 +41,31 @@ connector.register_session_factory( "PSDL:org/openorb/pss/examples/memory/transactional/second/MyCatalog:1.0", Thread.currentThread().getContextClassLoader().loadClass( - "org.openorb.pss.examples.memory.transactional.second.MyCatalogImpl" ) ); + "org.openorb.pss.examples.memory.transactional.second.MyCatalogImpl" ) ); // Register the person storage type factory connector.register_storage_object_factory( "PSDL:org/openorb/pss/examples/memory/transactional/second/PersonBase:1.0", Thread.currentThread().getContextClassLoader().loadClass( - "org.openorb.pss.examples.memory.transactional.second.PersonBaseImpl" ) ); + "org.openorb.pss.examples.memory.transactional.second.PersonBaseImpl" ) ); // Register the person storage home factory connector.register_storage_home_factory( "PSDL:org/openorb/pss/examples/memory/transactional/second/PersonHomeBase:1.0", Thread.currentThread().getContextClassLoader().loadClass( - "org.openorb.pss.examples.memory.transactional.second.PersonHomeBase" ) ); + "org.openorb.pss.examples.memory.transactional.second.PersonHomeBase" ) ); // Register the car storage type factory connector.register_storage_object_factory( "PSDL:org/openorb/pss/examples/memory/transactional/second/CarBase:1.0", Thread.currentThread().getContextClassLoader().loadClass( - "org.openorb.pss.examples.memory.transactional.second.CarBase" ) ); + "org.openorb.pss.examples.memory.transactional.second.CarBase" ) ); // Register the car storage home factory connector.register_storage_home_factory( "PSDL:org/openorb/pss/examples/memory/transactional/second/CarHomeBase:1.0", Thread.currentThread().getContextClassLoader().loadClass( - "org.openorb.pss.examples.memory.transactional.second.CarHomeBase" ) ); + "org.openorb.pss.examples.memory.transactional.second.CarHomeBase" ) ); // And now get the session access org.omg.CosPersistentState.Session mySession = null; @@ -100,7 +103,6 @@ System.out.println( "The server is ready..." ); orb.run(); - } catch ( java.lang.Exception ex ) { |
|
From: Michael R. <mr...@us...> - 2004-07-27 09:16:45
|
Update of /cvsroot/openorb/PersistentStateService/src/examples/org/openorb/pss/examples/memory/transactional/first In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16711/src/examples/org/openorb/pss/examples/memory/transactional/first Modified Files: Client.java FormImpl.java Server.java Log Message: Fixed all examples Index: Client.java =================================================================== RCS file: /cvsroot/openorb/PersistentStateService/src/examples/org/openorb/pss/examples/memory/transactional/first/Client.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Client.java 23 Jul 2004 23:11:57 -0000 1.2 +++ Client.java 27 Jul 2004 09:16:35 -0000 1.3 @@ -13,15 +13,18 @@ // Reference to the remote object private static Form s_form = null; + // Reference to the ORB + private static org.omg.CORBA.ORB s_orb = null; + // // The application entry point // public static void main( String args[] ) { + org.openorb.ots.Verbose.enable( null ); java.util.Properties props = new java.util.Properties(); props.put( "openorb.profile", "ots" ); - org.omg.CORBA.ORB orb = org.omg.CORBA.ORB.init( args, props ); - + s_orb = org.omg.CORBA.ORB.init( args, props ); org.omg.CORBA.Object obj = null; try @@ -31,7 +34,7 @@ java.io.BufferedReader reader = new java.io.BufferedReader( input ); String stringTarget = reader.readLine(); - obj = orb.string_to_object( stringTarget ); + obj = s_orb.string_to_object( stringTarget ); } catch ( java.io.IOException ex ) @@ -97,13 +100,43 @@ System.out.println( "" ); + org.omg.CORBA.Object obj = s_orb.resolve_initial_references( "TransactionCurrent" ); + + org.omg.CosTransactions.Current current = + org.omg.CosTransactions.CurrentHelper.narrow( obj ); + + current.begin(); + System.out.println( "current status is " + current.get_status().value() ); + s_form.createPerson( name, address, ageValue ); + + System.out.println( "Do you want to commit ( press C to commit," + + " others keys imply rollback )" ); + + String c = input(); + + if ( c.equalsIgnoreCase( "C" ) ) + { + current.commit( false ); + System.out.println( "Transaction is committed" ); + } + else + { + current.rollback(); + System.out.println( "Transaction is rolledback" ); + } + } catch ( org.omg.CORBA.SystemException ex ) { System.out.println( "A CORBA System exception has been intercepted" ); ex.printStackTrace(); } + catch ( java.lang.Exception ex ) + { + System.out.println( "An exception has been intercepted" ); + ex.printStackTrace(); + } } // @@ -119,13 +152,27 @@ System.out.println( "" ); + org.omg.CORBA.Object obj = s_orb.resolve_initial_references( "TransactionCurrent" ); + + org.omg.CosTransactions.Current current = + org.omg.CosTransactions.CurrentHelper.narrow( obj ); + + current.begin(); + s_form.removePerson( name ); + + current.commit( false ); } catch ( org.omg.CORBA.SystemException ex ) { System.out.println( "A CORBA System exception has been intercepted" ); ex.printStackTrace(); } + catch ( java.lang.Exception ex ) + { + System.out.println( "An exception has been intercepted" ); + ex.printStackTrace(); + } } // @@ -141,13 +188,27 @@ System.out.println( "" ); + org.omg.CORBA.Object obj = s_orb.resolve_initial_references( "TransactionCurrent" ); + + org.omg.CosTransactions.Current current = + org.omg.CosTransactions.CurrentHelper.narrow( obj ); + + current.begin(); + s_form.showPerson( name ); + + current.commit( false ); } catch ( org.omg.CORBA.SystemException ex ) { System.out.println( "A CORBA System exception has been intercepted" ); ex.printStackTrace(); } + catch ( java.lang.Exception ex ) + { + System.out.println( "An exception has been intercepted" ); + ex.printStackTrace(); + } } // Index: FormImpl.java =================================================================== RCS file: /cvsroot/openorb/PersistentStateService/src/examples/org/openorb/pss/examples/memory/transactional/first/FormImpl.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- FormImpl.java 10 Feb 2004 20:04:13 -0000 1.2 +++ FormImpl.java 27 Jul 2004 09:16:35 -0000 1.3 @@ -73,12 +73,12 @@ try { personHome = ( PersonHome ) m_connector.current_session().find_storage_home( - "PSDL:PersonHomeBase:1.0" ); + "PSDL:org/openorb/pss/examples/memory/transactional/first/PersonHomeBase:1.0" ); } catch ( org.omg.CosPersistentState.NotFound ex ) { - System.out.println( "The home was not found..." ); - throw new org.omg.CORBA.INTERNAL(); + System.out.println( "The home was not found!" ); + throw new org.omg.CORBA.INTERNAL( "The home was not found!" ); } return personHome; Index: Server.java =================================================================== RCS file: /cvsroot/openorb/PersistentStateService/src/examples/org/openorb/pss/examples/memory/transactional/first/Server.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Server.java 23 Jul 2004 23:11:57 -0000 1.3 +++ Server.java 27 Jul 2004 09:16:35 -0000 1.4 @@ -15,6 +15,9 @@ */ public static void main( String [] args ) { + org.openorb.ots.Verbose.enable( null ); + org.openorb.pss.util.debug.debugMode( true ); + java.util.Properties props = new java.util.Properties(); props.put( "ImportModule.PSS", "${openorb.home}config/pss.xml#pss" ); props.put( "openorb.profile", "ots" ); @@ -44,7 +47,7 @@ connector.register_storage_home_factory( "PSDL:org/openorb/pss/examples/memory/transactional/first/PersonHomeBase:1.0", Thread.currentThread().getContextClassLoader().loadClass( - "org.openorb.pss.examples.memory.transactional.first.PersonHomeBase" ) ); + "org.openorb.pss.examples.memory.transactional.first.PersonHomeBase" ) ); // And now creates the session pool org.omg.CosPersistentState.Session mySession = null; |
|
From: Michael R. <mr...@us...> - 2004-07-27 09:16:45
|
Update of /cvsroot/openorb/PersistentStateService/src/examples/org/openorb/pss/examples/file/transactional/first In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16711/src/examples/org/openorb/pss/examples/file/transactional/first Modified Files: Client.java FormImpl.java Server.java Log Message: Fixed all examples Index: Client.java =================================================================== RCS file: /cvsroot/openorb/PersistentStateService/src/examples/org/openorb/pss/examples/file/transactional/first/Client.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Client.java 23 Jul 2004 23:11:57 -0000 1.2 +++ Client.java 27 Jul 2004 09:16:35 -0000 1.3 @@ -21,10 +21,10 @@ // public static void main( String args[] ) { + org.openorb.ots.Verbose.enable( null ); java.util.Properties props = new java.util.Properties(); props.put( "openorb.profile", "ots" ); s_orb = org.omg.CORBA.ORB.init( args, props ); - org.omg.CORBA.Object obj = null; try @@ -106,11 +106,12 @@ org.omg.CosTransactions.CurrentHelper.narrow( obj ); current.begin(); + System.out.println( "current status is " + current.get_status().value() ); s_form.createPerson( name, address, ageValue ); - System.out.println( "Do you want to commit ( press C to commit, others keys" - + " imply rollback )" ); + System.out.println( "Do you want to commit ( press C to commit," + + " others keys imply rollback )" ); String c = input(); @@ -219,7 +220,6 @@ { java.io.BufferedReader reader = new java.io.BufferedReader( new java.io.InputStreamReader( System.in ) ); - return reader.readLine(); } catch ( java.lang.Exception ex ) Index: FormImpl.java =================================================================== RCS file: /cvsroot/openorb/PersistentStateService/src/examples/org/openorb/pss/examples/file/transactional/first/FormImpl.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- FormImpl.java 10 Feb 2004 20:04:13 -0000 1.2 +++ FormImpl.java 27 Jul 2004 09:16:35 -0000 1.3 @@ -75,12 +75,12 @@ System.out.println( "== > Connector : " + m_connector ); System.out.println( "== > current session : " + m_connector.current_session() ); personHome = ( PersonHome ) m_connector.current_session().find_storage_home( - "PSDL:PersonHomeBase:1.0" ); + "PSDL:org/openorb/pss/examples/file/transactional/first/PersonHomeBase:1.0" ); } catch ( org.omg.CosPersistentState.NotFound ex ) { - System.out.println( "The home was not found..." ); - throw new org.omg.CORBA.INTERNAL(); + System.out.println( "The home was not found!" ); + throw new org.omg.CORBA.INTERNAL( "The home was not found!" ); } return personHome; } Index: Server.java =================================================================== RCS file: /cvsroot/openorb/PersistentStateService/src/examples/org/openorb/pss/examples/file/transactional/first/Server.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Server.java 23 Jul 2004 23:11:57 -0000 1.3 +++ Server.java 27 Jul 2004 09:16:35 -0000 1.4 @@ -15,6 +15,9 @@ */ public static void main( String [] args ) { + org.openorb.ots.Verbose.enable( null ); + org.openorb.pss.util.debug.debugMode( true ); + java.util.Properties props = new java.util.Properties(); props.put( "ImportModule.PSS", "${openorb.home}config/pss.xml#pss" ); props.put( "openorb.profile", "ots" ); @@ -38,13 +41,13 @@ connector.register_storage_object_factory( "PSDL:org/openorb/pss/examples/file/transactional/first/PersonBase:1.0", Thread.currentThread().getContextClassLoader().loadClass( - "org.openorb.pss.examples.file.transactional.first.PersonBaseImpl" ) ); + "org.openorb.pss.examples.file.transactional.first.PersonBaseImpl" ) ); // Register the storage home factory connector.register_storage_home_factory( "PSDL:org/openorb/pss/examples/file/transactional/first/PersonHomeBase:1.0", Thread.currentThread().getContextClassLoader().loadClass( - "org.openorb.pss.examples.file.transactional.first.PersonHomeBase" ) ); + "org.openorb.pss.examples.file.transactional.first.PersonHomeBase" ) ); // And now creates the session pool org.omg.CosPersistentState.Session mySession = null; |
|
From: Michael R. <mr...@us...> - 2004-07-27 09:16:44
|
Update of /cvsroot/openorb/PersistentStateService/src/examples/org/openorb/pss/examples/database/transactional/second In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16711/src/examples/org/openorb/pss/examples/database/transactional/second Modified Files: MyCatalogImpl.java PersonBaseImpl.java Server.java Log Message: Fixed all examples Index: MyCatalogImpl.java =================================================================== RCS file: /cvsroot/openorb/PersistentStateService/src/examples/org/openorb/pss/examples/database/transactional/second/MyCatalogImpl.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- MyCatalogImpl.java 25 Mar 2003 08:45:31 -0000 1.1 +++ MyCatalogImpl.java 27 Jul 2004 09:16:35 -0000 1.2 @@ -15,7 +15,8 @@ { try { - return ( CarHome ) find_storage_home( "PSDL:CarHomeBase:1.0" ); + return ( CarHome ) find_storage_home( + "PSDL:org/openorb/pss/examples/database/transactional/second/CarHomeBase:1.0" ); } catch ( org.omg.CosPersistentState.NotFound ex ) { @@ -27,7 +28,9 @@ { try { - return ( PersonHome ) find_storage_home( "PSDL:PersonHomeBase:1.0" ); + return ( PersonHome ) find_storage_home( + "PSDL:org/openorb/pss/examples/database/transactional/second/PersonHomeBase:1.0" + ); } catch ( org.omg.CosPersistentState.NotFound ex ) { Index: PersonBaseImpl.java =================================================================== RCS file: /cvsroot/openorb/PersistentStateService/src/examples/org/openorb/pss/examples/database/transactional/second/PersonBaseImpl.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- PersonBaseImpl.java 25 Mar 2003 08:45:31 -0000 1.1 +++ PersonBaseImpl.java 27 Jul 2004 09:16:35 -0000 1.2 @@ -14,18 +14,18 @@ // public void print() { - System.out.println( "My name is : " + name() ); + System.out.println( "My name is : " + name() ); if ( ownCar() ) { - System.out.println( "I have a car : " ); + System.out.println( "I have a car : " ); Car my_car = car(); - System.out.println( "Car trademake : " + my_car.trademark() ); - System.out.println( "Car name : " + my_car.name() ); + System.out.println( "Car trademark : " + my_car.trademark() ); + System.out.println( "Car name : " + my_car.name() ); - System.out.print( "Car color : " ); + System.out.print( "Car color : " ); switch ( my_car.color().value() ) { @@ -50,7 +50,7 @@ } else { - System.out.println( "I have'nt got a car :-(" ); + System.out.println( "I haven't got a car :-(" ); } } @@ -66,4 +66,3 @@ return true; } } - Index: Server.java =================================================================== RCS file: /cvsroot/openorb/PersistentStateService/src/examples/org/openorb/pss/examples/database/transactional/second/Server.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Server.java 23 Jul 2004 23:11:57 -0000 1.3 +++ Server.java 27 Jul 2004 09:16:35 -0000 1.4 @@ -15,6 +15,9 @@ */ public static void main( String [] args ) { + org.openorb.ots.Verbose.enable( null ); + org.openorb.pss.util.debug.debugMode( true ); + java.util.Properties props = new java.util.Properties(); props.put( "ImportModule.PSS", "${openorb.home}config/pss.xml#pss" ); props.put( "openorb.profile", "ots" ); @@ -74,7 +77,7 @@ parameters[ 0 ] = new org.omg.CosPersistentState.Parameter(); parameters[ 0 ].name = "Profile"; parameters[ 0 ].val = orb.create_any(); - parameters[ 0 ].val.insert_string( "InstantDB" ); + parameters[ 0 ].val.insert_string( "HSQLDB" ); connector.create_session_pool( org.omg.CosPersistentState.READ_WRITE.value, |
|
From: Michael R. <mr...@us...> - 2004-07-27 09:16:43
|
Update of /cvsroot/openorb/PersistentStateService/src/examples/org/openorb/pss/examples/database/transactional/first In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16711/src/examples/org/openorb/pss/examples/database/transactional/first Modified Files: FormImpl.java Server.java Log Message: Fixed all examples Index: FormImpl.java =================================================================== RCS file: /cvsroot/openorb/PersistentStateService/src/examples/org/openorb/pss/examples/database/transactional/first/FormImpl.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- FormImpl.java 10 Feb 2004 20:04:13 -0000 1.3 +++ FormImpl.java 27 Jul 2004 09:16:30 -0000 1.4 @@ -75,12 +75,13 @@ System.out.println( "connector : " + m_connector ); System.out.println( "currentSession : " + m_connector.current_session() ); personHome = ( PersonHome ) m_connector.current_session().find_storage_home( - "PSDL:org/openorb/pss/examples/database/transactional/first/PersonHomeBase:1.0" ); + "PSDL:org/openorb/pss/examples/database/transactional/first/PersonHomeBase:1.0" + ); } catch ( org.omg.CosPersistentState.NotFound ex ) { - System.out.println( "The home was not found..." ); - throw new org.omg.CORBA.INTERNAL(); + System.out.println( "The home was not found!" ); + throw new org.omg.CORBA.INTERNAL( "The home was not found!" ); } return personHome; } Index: Server.java =================================================================== RCS file: /cvsroot/openorb/PersistentStateService/src/examples/org/openorb/pss/examples/database/transactional/first/Server.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- Server.java 23 Jul 2004 23:11:56 -0000 1.4 +++ Server.java 27 Jul 2004 09:16:35 -0000 1.5 @@ -41,13 +41,13 @@ connector.register_storage_object_factory( "PSDL:org/openorb/pss/examples/database/transactional/first/PersonBase:1.0", Thread.currentThread().getContextClassLoader().loadClass( - "org.openorb.pss.examples.database.transactional.first.PersonBaseImpl" ) ); + "org.openorb.pss.examples.database.transactional.first.PersonBaseImpl" ) ); // Register the storage home factory connector.register_storage_home_factory( "PSDL:org/openorb/pss/examples/database/transactional/first/PersonHomeBase:1.0", Thread.currentThread().getContextClassLoader().loadClass( - "org.openorb.pss.examples.database.transactional.first.PersonHomeBase" ) ); + "org.openorb.pss.examples.database.transactional.first.PersonHomeBase" ) ); // And now creates the session pool org.omg.CosPersistentState.Session mySession = null; @@ -58,7 +58,7 @@ parameters[ 0 ] = new org.omg.CosPersistentState.Parameter(); parameters[ 0 ].name = "Profile"; parameters[ 0 ].val = orb.create_any(); - parameters[ 0 ].val.insert_string( "InstantDB" ); + parameters[ 0 ].val.insert_string( "HSQLDB" ); connector.create_session_pool( org.omg.CosPersistentState.READ_WRITE.value, |
|
From: Michael R. <mr...@us...> - 2004-07-27 09:14:45
|
Update of /cvsroot/openorb/PersistentStateService/src/main/org/openorb/pss/connector/file In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16298/src/main/org/openorb/pss/connector/file Modified Files: FileSessionManager.java Log Message: Fixed PropagationContext handling for FileConnector Index: FileSessionManager.java =================================================================== RCS file: /cvsroot/openorb/PersistentStateService/src/main/org/openorb/pss/connector/file/FileSessionManager.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- FileSessionManager.java 10 Feb 2004 21:19:16 -0000 1.6 +++ FileSessionManager.java 27 Jul 2004 09:14:37 -0000 1.7 @@ -18,20 +18,20 @@ /** * Reference to the ORBInitInfo */ - org.omg.PortableInterceptor.ORBInitInfo _info; + org.omg.PortableInterceptor.ORBInitInfo m_info; /** * Registered session pool */ - private java.util.Vector _registered; + private java.util.Vector m_registered; /** * Constructor */ public FileSessionManager( org.omg.PortableInterceptor.ORBInitInfo info ) { - _info = info; - _registered = new java.util.Vector(); + m_info = info; + m_registered = new java.util.Vector(); } /** @@ -39,7 +39,7 @@ */ public void register( org.openorb.pss.connector.file.FileSessionPool pool ) { - _registered.addElement( pool ); + m_registered.addElement( pool ); } /** @@ -49,9 +49,9 @@ { org.openorb.pss.connector.file.FileSessionPool pool = null; - for ( int i = 0; i < _registered.size(); i++ ) + for ( int i = 0; i < m_registered.size(); i++ ) { - pool = ( org.openorb.pss.connector.file.FileSessionPool ) _registered.elementAt( i ); + pool = ( org.openorb.pss.connector.file.FileSessionPool ) m_registered.elementAt( i ); org.omg.CosPersistentState.TransactionalSession session = pool.connector().current_session(); @@ -70,9 +70,9 @@ { org.openorb.pss.connector.file.FileSessionPool pool = null; - for ( int i = 0; i < _registered.size(); i++ ) + for ( int i = 0; i < m_registered.size(); i++ ) { - pool = ( org.openorb.pss.connector.file.FileSessionPool ) _registered.elementAt( i ); + pool = ( org.openorb.pss.connector.file.FileSessionPool ) m_registered.elementAt( i ); org.omg.CosPersistentState.TransactionalSession session = pool.connector().current_session(); @@ -103,13 +103,11 @@ public void receive_request( org.omg.PortableInterceptor.ServerRequestInfo ri ) throws org.omg.PortableInterceptor.ForwardRequest { - if ( _registered.size() != 0 ) + if ( m_registered.size() != 0 ) { try { - org.omg.CORBA.Object obj = _info.resolve_initial_references( "TransactionCurrent" ); - - org.omg.CosTransactions.Current current = org.omg.CosTransactions.CurrentHelper.narrow( obj ); + org.omg.CosTransactions.Current current = getTransactionCurrent( ri ); switch ( current.get_status().value() ) { @@ -141,13 +139,11 @@ // public void send_reply( org.omg.PortableInterceptor.ServerRequestInfo ri ) { - if ( _registered.size() != 0 ) + if ( m_registered.size() != 0 ) { try { - org.omg.CORBA.Object obj = _info.resolve_initial_references( "TransactionCurrent" ); - - org.omg.CosTransactions.Current current = org.omg.CosTransactions.CurrentHelper.narrow( obj ); + org.omg.CosTransactions.Current current = getTransactionCurrent( ri ); switch ( current.get_status().value() ) { @@ -191,13 +187,11 @@ public void send_other( org.omg.PortableInterceptor.ServerRequestInfo ri ) throws org.omg.PortableInterceptor.ForwardRequest { - if ( _registered.size() != 0 ) + if ( m_registered.size() != 0 ) { try { - org.omg.CORBA.Object obj = _info.resolve_initial_references( "TransactionCurrent" ); - - org.omg.CosTransactions.Current current = org.omg.CosTransactions.CurrentHelper.narrow( obj ); + org.omg.CosTransactions.Current current = getTransactionCurrent( ri ); switch ( current.get_status().value() ) { @@ -232,4 +226,83 @@ public void destroy() {} + // + // Return transaction current with prepared PICurrent + // + private org.omg.CosTransactions.Current getTransactionCurrent(org.omg.PortableInterceptor.ServerRequestInfo ri ) + { + try + { + org.omg.CORBA.Object obj = m_info.resolve_initial_references( "TransactionCurrent" ); + + org.omg.CosTransactions.Current current = org.omg.CosTransactions.CurrentHelper.narrow( obj ); + + org.omg.CosTransactions.PropagationContext pctx = + getPropagationContext( ri ); + + if ( null != pctx ) + { + ( ( org.openorb.ots.Impl.Current ) current ).push_txcontext( pctx ); + ( ( org.openorb.ots.Impl.Current ) current ).pop_txcontext(); + } + return current; + } + catch ( Exception ex ) + { + ex.printStackTrace(); + return null; + } + } + + // + // Return propagation context of transction or null if propagation context not exists + // Need prepare TransactionCurrent before using + // + private org.omg.CosTransactions.PropagationContext getPropagationContext( org.omg.PortableInterceptor.ServerRequestInfo ri ) + { + org.openorb.ots.Verbose.print( "DatabaseSessionManager", + "getPropagationContext: " + ri.operation() ); + + org.omg.IOP.ServiceContext serviceCtx = null; + + try + { + serviceCtx = ri.get_request_service_context( org.omg.IOP.TransactionService.value ); + } + catch ( org.omg.CORBA.BAD_PARAM bp ) + { + org.openorb.ots.Verbose.print( "DatabaseSessionManager", + "getPropagationContext: OTS context not found." ); + return null; + } + + try + { + org.omg.IOP.CodecFactory codecFactory = m_info.codec_factory(); + org.omg.IOP.Encoding encoding = new org.omg.IOP.Encoding( + org.omg.IOP.ENCODING_CDR_ENCAPS.value, new Integer( 1 ).byteValue(), + new Integer( 2 ).byteValue() ); + org.omg.IOP.Codec codec = codecFactory.create_codec( encoding ); + + org.omg.CORBA.Any any = codec.decode_value( serviceCtx.context_data, + org.omg.CosTransactions.PropagationContextHelper.type() ); + + return org.omg.CosTransactions.PropagationContextHelper.extract( any ); + + } + catch ( org.omg.IOP.CodecFactoryPackage.UnknownEncoding ue ) + { + org.openorb.ots.Verbose.fatal( "DatabaseSessionManager", "Unknown encoding" ); + } + catch ( org.omg.IOP.CodecPackage.FormatMismatch fm ) + { + org.openorb.ots.Verbose.fatal( "DatabaseSessionManager", "Format Mismatch" ); + } + catch ( org.omg.IOP.CodecPackage.TypeMismatch fm ) + { + org.openorb.ots.Verbose.fatal( "DatabaseSessionManager", "Type Mismatch" ); + } + + return null; + } } |
|
From: Michael R. <mr...@us...> - 2004-07-27 09:11:41
|
Update of /cvsroot/openorb/PersistentStateService/src/main/org/openorb/pss/connector/database In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15889/src/main/org/openorb/pss/connector/database Modified Files: DatabaseSessionPool.java Log Message: Removed System.out.println Index: DatabaseSessionPool.java =================================================================== RCS file: /cvsroot/openorb/PersistentStateService/src/main/org/openorb/pss/connector/database/DatabaseSessionPool.java,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- DatabaseSessionPool.java 10 Feb 2004 21:19:15 -0000 1.8 +++ DatabaseSessionPool.java 27 Jul 2004 09:11:33 -0000 1.9 @@ -260,7 +260,6 @@ */ public org.omg.CosPersistentState.TransactionalSession prepare_free_session() { - System.out.println("DatabaseSessionPool.prepare_free_session: called."); boolean found = false; org.omg.CosPersistentState.TransactionalSession session = null; @@ -279,8 +278,6 @@ if ( found ) return session; - System.out.println("DatabaseSessionPool.prepare_free_session: create new transactional session."); - session = connector().create_transactional_session( access_mode(), _isolation_level, ( org.omg.CosPersistentState.EndOfAssociationCallback ) null, |
|
From: Michael R. <mr...@us...> - 2004-07-27 09:10:34
|
Update of /cvsroot/openorb/PersistentStateService/src/examples/org/openorb/pss/examples/database In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15754/src/examples/org/openorb/pss/examples/database Removed Files: pss.prp Log Message: Removed old InstantDB property file --- pss.prp DELETED --- |
|
From: Michael R. <mr...@us...> - 2004-07-27 09:05:10
|
Update of /cvsroot/openorb/tools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14714 Added Files: hsqldb_lic.txt hypersonic_lic.txt Log Message: Added HSQLDB license files --- NEW FILE: hsqldb_lic.txt --- /* Copyright (c) 2001-2004, The HSQL Development Group * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: * * Redistributions of source code must retain the above copyright notice, this * list of conditions and the following disclaimer. * * Redistributions in binary form must reproduce the above copyright notice, * this list of conditions and the following disclaimer in the documentation * and/or other materials provided with the distribution. * * Neither the name of the HSQL Development Group nor the names of its * contributors may be used to endorse or promote products derived from this * software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL HSQL DEVELOPMENT GROUP, HSQLDB.ORG, * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ --- NEW FILE: hypersonic_lic.txt --- /* Copyrights and Licenses * * This product includes Hypersonic SQL. * Originally developed by Thomas Mueller and the Hypersonic SQL Group. * * Copyright (c) 1995-2000 by the Hypersonic SQL Group. All rights reserved. * Redistribution and use in source and binary forms, with or without modification, are permitted * provided that the following conditions are met: * - Redistributions of source code must retain the above copyright notice, this list of conditions * and the following disclaimer. * - Redistributions in binary form must reproduce the above copyright notice, this list of * conditions and the following disclaimer in the documentation and/or other materials * provided with the distribution. * - All advertising materials mentioning features or use of this software must display the * following acknowledgment: "This product includes Hypersonic SQL." * - Products derived from this software may not be called "Hypersonic SQL" nor may * "Hypersonic SQL" appear in their names without prior written permission of the * Hypersonic SQL Group. * - Redistributions of any form whatsoever must retain the following acknowledgment: "This * product includes Hypersonic SQL." * This software is provided "as is" and any expressed or implied warranties, including, but * not limited to, the implied warranties of merchantability and fitness for a particular purpose are * disclaimed. In no event shall the Hypersonic SQL Group or its contributors be liable for any * direct, indirect, incidental, special, exemplary, or consequential damages (including, but * not limited to, procurement of substitute goods or services; loss of use, data, or profits; * or business interruption). However caused any on any theory of liability, whether in contract, * strict liability, or tort (including negligence or otherwise) arising in any way out of the use of this * software, even if advised of the possibility of such damage. * This software consists of voluntary contributions made by many individuals on behalf of the * Hypersonic SQL Group. * * * For work added by the HSQL Development Group: * * Copyright (c) 2001-2004, The HSQL Development Group * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: * * Redistributions of source code must retain the above copyright notice, this * list of conditions and the following disclaimer, including earlier * license statements (above) and comply with all above license conditions. * * Redistributions in binary form must reproduce the above copyright notice, * this list of conditions and the following disclaimer in the documentation * and/or other materials provided with the distribution, including earlier * license statements (above) and comply with all above license conditions. * * Neither the name of the HSQL Development Group nor the names of its * contributors may be used to endorse or promote products derived from this * software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL HSQL DEVELOPMENT GROUP, HSQLDB.ORG, * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ |
|
From: Michael R. <mr...@us...> - 2004-07-27 06:30:14
|
Update of /cvsroot/openorb/tools/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23645/src Modified Files: build.xml Log Message: Added HSQLDB version 1.7.2 Index: build.xml =================================================================== RCS file: /cvsroot/openorb/tools/src/build.xml,v retrieving revision 1.38 retrieving revision 1.39 diff -u -d -r1.38 -r1.39 --- build.xml 23 Jul 2004 06:42:24 -0000 1.38 +++ build.xml 27 Jul 2004 06:30:05 -0000 1.39 @@ -78,13 +78,13 @@ <property name="compiler-override-src" value="src/compiler-override"/> <property name="compiler-override-classes" value="${build.dir}/compiler-override"/> - - <!-- + + <!-- Default paths for runtime libraries for the Sun and IBM JDK's. Users can override this value by setting it in the ../personal.properties or local.properties file. --> - <property name="jdk-runtime-library" + <property name="jdk-runtime-library" value="${java.home}/lib/rt.jar:${java.home}/lib/core.jar:${java.home}/lib/server.jar"/> @@ -248,7 +248,7 @@ <echo message="build.deprecation=${build.debug}" /> <echo message="build.optimize=${build.debug}" /> </target> - + <target name="-init"> <tstamp> <format property="timestamp" pattern="yyyy-MM-dd hh:mm:ss z (zzzz)"/> @@ -646,8 +646,8 @@ </target> <target name="-check-docbook-unpacked"> - <uptodate property="docbook-unpacked" - srcfile="${etc.dir}/docbook.tgz" + <uptodate property="docbook-unpacked" + srcfile="${etc.dir}/docbook.tgz" targetfile="${docbook.dir}/.docbook-unpacked"/> </target> @@ -657,11 +657,11 @@ <untar src="${etc.dir}/docbook.tgz" compression="gzip" dest="${docbook.dir}"/> - + <copy todir="${docbook.dir}"> <fileset dir="${src.docbook.dir}" includes="*.xsl"/> </copy> - + <echo file="${docbook.dir}/.docbook-unpacked">#Flag file</echo> </target> @@ -770,6 +770,8 @@ <include name="README" /> <include name="LICENSE.txt" /> <include name="WHATSNEW" /> + <include name="hypersonic_lic.txt" /> + <include name="hsqldb_lic.txt" /> </fileset> </copy> |
2 messages has been excluded from this view by a project administrator.
