Author: thomas.diesler(a)jboss.com Date: 2008-04-15 16:23:17 -0400 (Tue, 15 Apr 2008) New Revision: 6442 Added: stack/cxf/branches/tdiesler/trunk/testsuite/src/test/etc/jndi.properties stack/cxf/branches/tdiesler/trunk/testsuite/src/test/etc/tst.policy Modified: stack/cxf/branches/tdiesler/trunk/testsuite/ant/build-jars-jaxws.xml stack/cxf/branches/tdiesler/trunk/testsuite/pom.xml stack/cxf/branches/tdiesler/trunk/testsuite/src/test/etc/log4j.xml Log: more work on tests Modified: stack/cxf/branches/tdiesler/trunk/testsuite/ant/build-jars-jaxws.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/testsuite/ant/build-jars-jaxws.xml 2008-04-15 19:14:12 UTC (rev 6441) +++ stack/cxf/branches/tdiesler/trunk/testsuite/ant/build-jars-jaxws.xml 2008-04-15 20:23:17 UTC (rev 6442) @@ -22,36 +22,36 @@ <target name="build-jars" description="Build the deployments."> - <mkdir dir="${tests.output.dir}/libs"/> + <mkdir dir="${tests.output.dir}/test-libs"/> <!-- jaxws-cxf-descriptor --> - <war warfile="${tests.output.dir}/libs/jaxws-cxf-descriptor.war" webxml="${tests.output.dir}/resources/jaxws/cxf/descriptor/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> + <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-descriptor.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/descriptor/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpointImpl.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/cxf/descriptor/WEB-INF"> + <webinf dir="${tests.output.dir}/test-resources/jaxws/cxf/descriptor/WEB-INF"> <include name="jbossws-cxf.xml"/> </webinf> </war> <!-- jaxws-cxf-wsrm-basic-doc --> - <war warfile="${tests.output.dir}/libs/jaxws-cxf-wsrm-basic-doc.war" webxml="${tests.output.dir}/resources/jaxws/cxf/wsrm/basic-doc/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> + <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-wsrm-basic-doc.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/wsrm/basic-doc/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocEndpointImpl.class"/> <include name="org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocEndpoint.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/cxf/wsrm/basic-doc/WEB-INF"> + <webinf dir="${tests.output.dir}/test-resources/jaxws/cxf/wsrm/basic-doc/WEB-INF"> <include name="jbossws-cxf.xml"/> </webinf> </war> <!-- jaxws-cxf-wsrm-basic-rpc --> - <war warfile="${tests.output.dir}/libs/jaxws-cxf-wsrm-basic-rpc.war" webxml="${tests.output.dir}/resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> + <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-wsrm-basic-rpc.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCEndpointImpl.class"/> <include name="org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCEndpoint.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF"> + <webinf dir="${tests.output.dir}/test-resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF"> <include name="jbossws-cxf.xml"/> </webinf> </war> Modified: stack/cxf/branches/tdiesler/trunk/testsuite/pom.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/testsuite/pom.xml 2008-04-15 19:14:12 UTC (rev 6441) +++ stack/cxf/branches/tdiesler/trunk/testsuite/pom.xml 2008-04-15 20:23:17 UTC (rev 6442) @@ -16,12 +16,18 @@ <!-- Properties --> <properties> <jbossws.integration.target>jboss500</jbossws.integration.target> + <jboss.bind.address>localhost</jboss.bind.address> + <jboss.version>5.0.0-SNAPSHOT</jboss.version> + <surefire.jvm.args>-Djava.security.manager -Djava.security.policy=src/test/etc/tst.policy</surefire.jvm.args> </properties> <build> <testResources> <testResource> - <targetPath>../resources</targetPath> + <directory>src/test/etc</directory> + </testResource> + <testResource> + <targetPath>../test-resources</targetPath> <directory>src/test/resources</directory> </testResource> </testResources> @@ -47,8 +53,13 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> + <argLine>${surefire.jvm.args}</argLine> <systemProperties> <property> + <name>java.naming.provider.url</name> + <value>jnp://${jboss.bind.address}:1099</value> + </property> + <property> <name>java.util.logging.manager</name> <value>org.jboss.wsf.common.logging.JDKLogManager</value> </property> @@ -56,10 +67,43 @@ <name>jbossws.integration.target</name> <value>${jbossws.integration.target}</value> </property> + <property> + <name>jbossws.test.log</name> + <value>${project.build.directory}</value> + </property> + <property> + <name>test.archive.directory</name> + <value>${project.build.directory}/test-libs</value> + </property> + <property> + <name>test.resources.directory</name> + <value>${project.build.directory}/test-resources</value> + </property> </systemProperties> </configuration> </plugin> </plugins> </build> + <profiles> + <profile> + <id>jboss500</id> + <dependencies> + </dependencies> + </profile> + </profiles> + + <dependencies> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jnp-client</artifactId> + <version>5.0.0.Beta4</version> + </dependency> + <dependency> + <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-as-server</artifactId> + <version>${jboss.version}</version> + </dependency> + </dependencies> + </project> Added: stack/cxf/branches/tdiesler/trunk/testsuite/src/test/etc/jndi.properties =================================================================== --- stack/cxf/branches/tdiesler/trunk/testsuite/src/test/etc/jndi.properties (rev 0) +++ stack/cxf/branches/tdiesler/trunk/testsuite/src/test/etc/jndi.properties 2008-04-15 20:23:17 UTC (rev 6442) @@ -0,0 +1,3 @@ +java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory +java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces +java.naming.provider.url=jnp://@jboss.bind.address@:1099 \ No newline at end of file Modified: stack/cxf/branches/tdiesler/trunk/testsuite/src/test/etc/log4j.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/testsuite/src/test/etc/log4j.xml 2008-04-15 19:14:12 UTC (rev 6441) +++ stack/cxf/branches/tdiesler/trunk/testsuite/src/test/etc/log4j.xml 2008-04-15 20:23:17 UTC (rev 6442) @@ -22,7 +22,7 @@ <!-- A time/date based rolling appender --> <appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender"> - <param name="File" value="${build.testlog}/test.log"/> + <param name="File" value="${jbossws.test.log}/test.log"/> <param name="Append" value="true"/> <!-- Rollover at midnight each day --> Added: stack/cxf/branches/tdiesler/trunk/testsuite/src/test/etc/tst.policy =================================================================== --- stack/cxf/branches/tdiesler/trunk/testsuite/src/test/etc/tst.policy (rev 0) +++ stack/cxf/branches/tdiesler/trunk/testsuite/src/test/etc/tst.policy 2008-04-15 20:23:17 UTC (rev 6442) @@ -0,0 +1,4 @@ +grant { + permission java.security.AllPermission; +}; +