maguro 2005/03/07 23:08:29
Modified: modules/itests maven.xml project.properties project.xml
Log:
Intermediate CORBA checkin.
Revision Changes Path
1.23 +46 -6 openejb/modules/itests/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/projects/openejb/scm/openejb/modules/itests/maven.xml,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- maven.xml 24 Jan 2005 19:59:42 -0000 1.22
+++ maven.xml 8 Mar 2005 04:08:28 -0000 1.23
@@ -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"
+ 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=org.openorb.orb.rmi.UtilDelegateImpl
-Dorg.omg.CORBA.ORBClass=org.openorb.orb.core.ORB
-Dorg.omg.CORBA.ORBSingletonClass=org.openorb.orb.core.ORBSingleton "
configs="org/openejb/Security"/>
<ant:echo message="Waiting for server at: ${geronimoTarget}"/>
<deploy:waitForStarted
@@ -63,6 +63,15 @@
<metainf dir="${basedir}/src/scenarios/002" includes="*.xml"/>
</ant:jar>
+ <ant:jar destfile="${basedir}/target/openejb-security-003.jar">
+ <fileset dir="${basedir}/target/classes">
+ <include name="**/interop/**/*.class"/>
+ <include name="**/security/slsb/BasicStatelessHome.class"/>
+ <include name="**/security/slsb/BasicStateless.class"/>
+ </fileset>
+ <metainf dir="${basedir}/src/scenarios/003" includes="*.xml"/>
+ </ant:jar>
+
<deploy:distribute
uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
username="system"
@@ -75,6 +84,12 @@
password="manager"
module="${basedir}/target/openejb-security-002.jar"
/>
+ <deploy:distribute
+
uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
+ username="system"
+ password="manager"
+ module="${basedir}/target/openejb-security-003.jar"
+ />
<deploy:start
uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
username="system"
@@ -85,6 +100,11 @@
username="system"
password="manager"
id="org/openejb/scenario002"/>
+ <deploy:start
+
uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
+ username="system"
+ password="manager"
+ id="org/openejb/scenario003"/>
</preGoal>
<preGoal name="itest:teardown">
@@ -92,21 +112,26 @@
uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
username="system"
password="manager"
- id="org/openejb/scenario002"/>
+ id="org/openejb/scenario003"/>
<deploy:undeploy
uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
username="system"
password="manager"
- id="org/openejb/scenario002"/>
+ id="org/openejb/scenario003"/>
<deploy:stop
uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
username="system"
password="manager"
- id="org/openejb/scenario001"/>
+ id="org/openejb/scenario002"/>
<deploy:undeploy
uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
username="system"
password="manager"
+ id="org/openejb/scenario002"/>
+ <deploy:stop
+
uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
+ username="system"
+ password="manager"
id="org/openejb/scenario001"/>
<deploy:stop
uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
@@ -129,7 +154,7 @@
<goal name="svr:start">
<deploy:startRemoteServer
geronimoTarget="${maven.build.dir}/openejb"
- vmArgs="-Xmx512m -XX:MaxPermSize=128m
-Djava.rmi.server.RMIClassLoaderSpi=org.apache.geronimo.system.rmi.RMIClassLoaderSpiImpl"
+ vmArgs="-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=org.openorb.orb.rmi.UtilDelegateImpl
-Dorg.omg.CORBA.ORBClass=org.openorb.orb.core.ORB
-Dorg.omg.CORBA.ORBSingletonClass=org.openorb.orb.core.ORBSingleton "
configs="org/openejb/Security"/>
<ant:echo message="Waiting for server at: ${geronimoTarget}"/>
<deploy:waitForStarted
@@ -159,6 +184,16 @@
password="manager"
module="${basedir}/target/openejb-security-001.jar"
/>
+ <ant:jar destfile="${basedir}/target/openejb-security-003.jar">
+ <fileset dir="${basedir}/target/classes"
includes="**/security/**/*.class"/>
+ <metainf dir="${basedir}/src/scenarios/001" includes="*.xml"/>
+ </ant:jar>
+ <deploy:distribute
+
uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
+ username="system"
+ password="manager"
+ module="${basedir}/target/openejb-security-003.jar"
+ />
<deploy:start
uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
username="system"
@@ -172,6 +207,11 @@
username="system"
password="manager"
id="org/openejb/scenario001"/>
+ <deploy:stop
+
uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
+ username="system"
+ password="manager"
+ id="org/openejb/scenario003"/>
<deploy:undeploy
uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
username="system"
1.22 +10 -5 openejb/modules/itests/project.properties
Index: project.properties
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/itests/project.properties,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- project.properties 25 Feb 2005 23:06:15 -0000 1.21
+++ project.properties 8 Mar 2005 04:08:28 -0000 1.22
@@ -6,16 +6,21 @@
maven.multiproject.type=ejb
-maven.itest.jvmargs=-Djava.rmi.server.RMIClassLoaderSpi=org.apache.geronimo.system.rmi.RMIClassLoaderSpiImpl
-Djava.security.auth.login.config=${maven.itest.dest}/login.config
+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
-#maven.itest.includes=**/BmpTestSuite.java
-maven.itest.includes=**/CmpTestSuite.java,**/Cmp2TestSuite.java,**/BmpTestSuite.java,**/StatefulTestSuite.java,**/StatelessTestSuite.java,**/security/**/*Tests.java
+maven.itest.includes=**/interop/**/*Tests.java
+#maven.itest.includes=**/security/**/*Tests.java
+#maven.itest.includes=**/CmpTestSuite.java,**/Cmp2TestSuite.java,**/BmpTestSuite.java,**/StatefulTestSuite.java,**/StatelessTestSuite.java,**/security/**/*Tests.java
-maven.itest.sysproperties=openejb.test.server openejb.test.database
java.security.auth.login.config java.rmi.server.RMIClassLoaderSpi
+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
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.27 +37 -1 openejb/modules/itests/project.xml
Index: project.xml
===================================================================
RCS file: /home/projects/openejb/scm/openejb/modules/itests/project.xml,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- project.xml 27 Dec 2004 03:18:08 -0000 1.26
+++ project.xml 8 Mar 2005 04:08:28 -0000 1.27
@@ -163,6 +163,42 @@
</dependency>
<dependency>
+ <groupId>openorb</groupId>
+ <artifactId>openorb-orb-omg</artifactId>
+ <version>${openorb_version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>openorb</groupId>
+ <artifactId>openorb-orb-tools</artifactId>
+ <version>${openorb_version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>openorb</groupId>
+ <artifactId>openorb-tools</artifactId>
+ <version>${openorb_version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>avalon</groupId>
+ <artifactId>avalon-framework</artifactId>
+ <version>${avalon_framework_version}</version>
+ <properties>
+ <repository>true</repository>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>avalon</groupId>
+ <artifactId>avalon-logkit</artifactId>
+ <version>${avalon_logkit_version}</version>
+ <properties>
+ <repository>true</repository>
+ </properties>
+ </dependency>
+
+ <dependency>
<groupId>incubator-derby</groupId>
<artifactId>derby</artifactId>
<version>${derby_version}</version>
