maguro 2004/09/12 13:11:54
Modified: modules/itests maven.xml project.properties project.xml
Log:
Some security tests.
Revision Changes Path
1.12 +69 -5 openejb/modules/itests/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/projects/openejb/scm/openejb/modules/itests/maven.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- maven.xml 9 Sep 2004 00:35:03 -0000 1.11
+++ maven.xml 12 Sep 2004 17:11:54 -0000 1.12
@@ -101,7 +101,6 @@
</j:if>
</goal>
-
<goal name="itest:itest"
description="Run Application Integration Tests"
prereqs="itest:compile">
@@ -188,12 +187,13 @@
<deploy:startRemoteServer
geronimoTarget="${maven.build.dir}/openejb"
vmArgs="-Djava.rmi.server.RMIClassLoaderSpi=org.apache.geronimo.rmi.RMIClassLoaderSpiImpl"
- configs="org/apache/geronimo/DefaultDatabase"/>
+ configs="org/openejb/Security"/>
+ <ant:echo message="Waiting for server at: ${geronimoTarget}"/>
<deploy:waitForStarted
uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
username="system"
password="manager"
- id="org/apache/geronimo/DefaultDatabase"/>
+ id="org/openejb/Security"/>
<echo message="server has started"/>
<deploy:distribute
uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
@@ -233,7 +233,7 @@
description="Copy any resources that must be present for the integration
tests to run"
prereqs="itest:prepare-filesystem">
- <j:if test="${itest.skip != 'true' and itest.resources != null}">
+ <j:if test="${itest.skip != 'true' and
context.getVariable('itest.resources') != null}">
<ant:copy todir="${itest.dest}">
<u:tokenize var="resources" delim=",
">${itest.resources}</u:tokenize>
<j:forEach var="resource" items="${resources}">
@@ -250,5 +250,69 @@
</j:if>
</goal>
+
+
+ <preGoal name="itest:itest">
+ <ant:jar destfile="${basedir}/target/openejb-security-001.jar">
+ <fileset dir="${basedir}/target/classes" includes="**/security/**/*.class"/>
+ <metainf dir="${basedir}/src/scenarios/001" includes="*.xml"/>
+ </ant:jar>
+
+ <ant:jar destfile="${basedir}/target/openejb-security-002.jar">
+ <fileset dir="${basedir}/target/classes" includes="**/security/**/*.class"/>
+ <metainf dir="${basedir}/src/scenarios/002" includes="*.xml"/>
+ </ant:jar>
+ </preGoal>
+
+
+ <postGoal name="itest:setup">
+ <deploy:distribute
+ uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
+ username="system"
+ password="manager"
+ home="${basedir}"
+ module="${basedir}/target/openejb-security-001.jar"
+ />
+ <deploy:distribute
+ uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
+ username="system"
+ password="manager"
+ home="${basedir}"
+ module="${basedir}/target/openejb-security-002.jar"
+ />
+ <deploy:start
+ uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
+ username="system"
+ password="manager"
+ id="org/openejb/scenario001"/>
+ <deploy:start
+ uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
+ username="system"
+ password="manager"
+ id="org/openejb/scenario002"/>
+ </postGoal>
+
+ <preGoal name="itest:teardown">
+ <deploy:stop
+ uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
+ username="system"
+ password="manager"
+ 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:undeploy
+ uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
+ username="system"
+ password="manager"
+ id="org/openejb/scenario001"/>
+ </preGoal>
</project>
1.7 +11 -5 openejb/modules/itests/project.properties
Index: project.properties
===================================================================
RCS file: /home/projects/openejb/scm/openejb/modules/itests/project.properties,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- project.properties 8 Sep 2004 17:08:30 -0000 1.6
+++ project.properties 12 Sep 2004 17:11:54 -0000 1.7
@@ -7,7 +7,7 @@
itest.dir=${basedir}
itest.fork=no
itest.format=brief
-itest.jvmargs=-Djava.rmi.server.RMIClassLoaderSpi=org.apache.geronimo.rmi.RMIClassLoaderSpiImpl
+itest.jvmargs=-Djava.rmi.server.RMIClassLoaderSpi=org.apache.geronimo.rmi.RMIClassLoaderSpiImpl
-Djava.security.auth.login.config=${itest.dest}/login.config
itest.envvars=
itest.jvm=
itest.printSummary=true
@@ -21,11 +21,17 @@
itest.src.includes=
itest.src.excludes=
-itest.includes=**/CmpTestSuite.java,**/BmpTestSuite.java,**/StatefulTestSuite.java,**/StatelessTestSuite.java
+itest.includes=**/CmpTestSuite.java,**/BmpTestSuite.java,**/StatefulTestSuite.java,**/StatelessTestSuite.java,**/security/**/*Tests.java
itest.excludes=**/Abstract*.java
-itest.sysproperties=openejb.test.server openejb.test.database
+itest.sysproperties=openejb.test.server openejb.test.database
java.security.auth.login.config java.rmi.server.RMIClassLoaderSpi
openejb.test.server=org.openejb.test.RemoteTestServer
openejb.test.database=org.openejb.test.AxionTestDatabase
+java.security.auth.login.config=${itest.dest}/login.config
+java.rmi.server.RMIClassLoaderSpi=org.apache.geronimo.rmi.RMIClassLoaderSpiImpl
-itest.resources=
\ No newline at end of file
+itest.resources=loginConfig
+
+loginConfig.dir=${basedir}/src/test-resources
+loginConfig.includes=
+loginConfig.excludes=
1.17 +31 -1 openejb/modules/itests/project.xml
Index: project.xml
===================================================================
RCS file: /home/projects/openejb/scm/openejb/modules/itests/project.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- project.xml 8 Sep 2004 23:56:04 -0000 1.16
+++ project.xml 12 Sep 2004 17:11:54 -0000 1.17
@@ -38,6 +38,24 @@
<dependency>
<groupId>geronimo</groupId>
+ <artifactId>geronimo-kernel</artifactId>
+ <version>&geronimo-version;</version>
+ </dependency>
+
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-core</artifactId>
+ <version>&geronimo-version;</version>
+ </dependency>
+
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-remoting</artifactId>
+ <version>&geronimo-version;</version>
+ </dependency>
+
+ <dependency>
+ <groupId>geronimo</groupId>
<artifactId>geronimo-security</artifactId>
<version>&geronimo-version;</version>
</dependency>
@@ -105,6 +123,18 @@
<properties>
<classloader>root</classloader>
</properties>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>&commons-logging-version;</version>
+ </dependency>
+
+ <dependency>
+ <groupId>concurrent</groupId>
+ <artifactId>concurrent</artifactId>
+ <version>&concurrent-version;</version>
</dependency>
</dependencies>
</project>
