dain 2005/03/29 18:24:46
Modified: modules/itests maven.xml project.properties project.xml
Log:
Fixed classloader problems on apple
Removed use of tmporb omg classes on the client side as they are not serial
version id compatiable with the apple vm
Fixed the corba related vm properties so they always use the sun orb (as we
intended)
Revision Changes Path
1.25 +3 -3 openejb/modules/itests/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/projects/openejb/scm/openejb/modules/itests/maven.xml,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- maven.xml 27 Mar 2005 02:04:42 -0000 1.24
+++ maven.xml 29 Mar 2005 23:24:45 -0000 1.25
@@ -32,7 +32,7 @@
</ant:copy>
<deploy:startRemoteServer
geronimoTarget="${maven.build.dir}/openejb"
- vmArgs="-Xdebug -Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005 -Xmx512m
-XX:MaxPermSize=128m
-Djava.rmi.server.RMIClassLoaderSpi=org.apache.geronimo.system.rmi.RMIClassLoaderSpiImpl
-Djavax.rmi.CORBA.UtilClass=org.openejb.corba.util.UtilDelegateImpl
-Dorg.openejb.corba.UtilDelegateClass=com.sun.corba.se.internal.POA.ShutdownUtilDelegate
"
+ vmArgs="-Xdebug -Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005 -Xmx512m
-XX:MaxPermSize=128m ${corba.vmargs}"
configs="org/openejb/Security"/>
<ant:echo message="Waiting for server at: ${geronimoTarget}"/>
<deploy:waitForStarted
@@ -149,7 +149,7 @@
<goal name="svr:start">
<deploy:startRemoteServer
geronimoTarget="${maven.build.dir}/openejb"
- vmArgs="-Xmx512m -XX:MaxPermSize=128m -Xdebug -Xnoagent
-Dcom.sun.CORBA.ORBDebug=transport,giop,subcontract,POA,naming,serviceContext
-Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005
-Djava.rmi.server.RMIClassLoaderSpi=org.apache.geronimo.system.rmi.RMIClassLoaderSpiImpl
-Djavax.rmi.CORBA.UtilClass=org.openejb.corba.util.UtilDelegateImpl
-Dorg.openejb.corba.UtilDelegateClass=com.sun.corba.se.internal.POA.ShutdownUtilDelegate
"
+ vmArgs="-Xmx512m -XX:MaxPermSize=128m -Xdebug -Xnoagent
-Dcom.sun.CORBA.ORBDebug=transport,giop,subcontract,POA,naming,serviceContext
-Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005 ${corba.vmargs}"
configs="org/openejb/Security"/>
<ant:echo message="Waiting for server at: ${geronimoTarget}"/>
<deploy:waitForStarted
1.30 +5 -8 openejb/modules/itests/project.properties
Index: project.properties
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/itests/project.properties,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- project.properties 27 Mar 2005 02:04:42 -0000 1.29
+++ project.properties 29 Mar 2005 23:24:45 -0000 1.30
@@ -6,19 +6,16 @@
maven.multiproject.type=ejb
-maven.itest.jvmargs=-Djava.rmi.server.RMIClassLoaderSpi=org.apache.geronimo.system.rmi.RMIClassLoaderSpiImpl
-Djavax.rmi.CORBA.UtilClass=org.openejb.corba.util.UtilDelegateImpl
-Dorg.openejb.corba.UtilDelegateClass=org.openorb.orb.rmi.UtilDelegateImpl
-Djava.security.auth.login.config=${maven.itest.dest}/login.config
+corba.vmargs=-Djava.rmi.server.RMIClassLoaderSpi=org.apache.geronimo.system.rmi.RMIClassLoaderSpiImpl
-Djavax.rmi.CORBA.UtilClass=org.openejb.corba.util.UtilDelegateImpl
-Dorg.openejb.corba.UtilDelegateClass=com.sun.corba.se.internal.POA.ShutdownUtilDelegate
+
+maven.itest.jvmargs=${corba.vmargs}
-Djava.security.auth.login.config=${maven.itest.dest}/login.config
maven.itest.includes=**/CmpTestSuite.java,**/Cmp2TestSuite.java,**/BmpTestSuite.java,**/StatefulTestSuite.java,**/StatelessTestSuite.java,**/security/**/*Tests.java,**/interop/**/*Tests.java
-maven.itest.sysproperties=openejb.test.server openejb.test.database
java.security.auth.login.config java.rmi.server.RMIClassLoaderSpi
javax.rmi.CORBA.UtilClass org.openejb.corba.UtilDelegateClass
org.omg.CORBA.ORBClass org.omg.CORBA.ORBSingletonClass
+maven.itest.sysproperties=openejb.test.server openejb.test.database
java.security.auth.login.config
openejb.test.server=org.openejb.test.RemoteTestServer
openejb.test.database=org.openejb.test.DerbyTestDatabase
java.security.auth.login.config=${maven.itest.dest}/login.config
-java.rmi.server.RMIClassLoaderSpi=org.apache.geronimo.system.rmi.RMIClassLoaderSpiImpl
-javax.rmi.CORBA.UtilClass=org.openejb.corba.util.UtilDelegateImpl
-org.openejb.corba.UtilDelegateClass=org.openorb.orb.rmi.UtilDelegateImpl
-org.omg.CORBA.ORBClass=org.openorb.orb.core.ORB
-org.omg.CORBA.ORBSingletonClass=org.openorb.orb.core.ORBSingleton
maven.itest.resources=loginConfig
1.29 +1 -7 openejb/modules/itests/project.xml
Index: project.xml
===================================================================
RCS file: /home/projects/openejb/scm/openejb/modules/itests/project.xml,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- project.xml 20 Mar 2005 07:37:42 -0000 1.28
+++ project.xml 29 Mar 2005 23:24:45 -0000 1.29
@@ -164,12 +164,6 @@
<dependency>
<groupId>tmporb</groupId>
- <artifactId>tmporb-orb-omg</artifactId>
- <version>${tmporb_version}</version>
- </dependency>
-
- <dependency>
- <groupId>tmporb</groupId>
<artifactId>tmporb-orb-tools</artifactId>
<version>${tmporb_version}</version>
</dependency>
