Author: thomas.diesler(a)jboss.com Date: 2006-11-22 08:27:13 -0500 (Wed, 22 Nov 2006) New Revision: 1501 Modified: trunk/build.xml trunk/src/ant/build-samples.xml trunk/src/ant/build-thirdparty.xml trunk/src/main/resources/samples/common/imported-build.xml trunk/src/main/resources/samples/common/log4j.xml trunk/src/main/resources/samples/jaxrpc/wssecurity/build.xml trunk/src/test/java/org/jboss/test/ws/JBossWSTestHelper.java Log: Decouple samples build from target container Modified: trunk/build.xml =================================================================== --- trunk/build.xml 2006-11-22 13:12:53 UTC (rev 1500) +++ trunk/build.xml 2006-11-22 13:27:13 UTC (rev 1501) @@ -396,9 +396,11 @@ <!-- Deploy to Tomcat --> <target name="deploy-tomcat" depends="main,jbossws-thirdparty-jar" description="Deploy JBossWS to Tomcat"> + <copy todir="${tomcat.common.dir}/endorsed" file="${thirdparty.dir}/resolver.jar"/> <copy todir="${tomcat.common.dir}/endorsed" file="${thirdparty.dir}/serializer.jar"/> <copy todir="${tomcat.common.dir}/endorsed" file="${thirdparty.dir}/xalan.jar"/> <copy todir="${tomcat.common.dir}/endorsed" file="${thirdparty.dir}/xercesImpl.jar"/> + <copy todir="${tomcat.common.dir}/endorsed" file="${thirdparty.dir}/xml-apis.jar"/> <copy todir="${tomcat.common.dir}/lib" file="${thirdparty.dir}/activation.jar"/> <copy todir="${tomcat.common.dir}/lib" file="${thirdparty.dir}/log4j.jar"/> <copy todir="${tomcat.common.dir}/lib" file="${thirdparty.dir}/mailapi.jar"/> Modified: trunk/src/ant/build-samples.xml =================================================================== --- trunk/src/ant/build-samples.xml 2006-11-22 13:12:53 UTC (rev 1500) +++ trunk/src/ant/build-samples.xml 2006-11-22 13:27:13 UTC (rev 1501) @@ -31,6 +31,14 @@ <mkdir dir="${build.src.samples.dir}/lib"/> <copy todir="${build.src.samples.dir}/lib"> + <fileset dir="${jboss.client}"> + <include name="commons-logging.jar"/> + <include name="jbossall-client.jar"/> + <include name="mail.jar"/> + <include name="jboss-aop-jdk50-client.jar"/> + <include name="jboss-aspect-jdk50-client.jar"/> + <include name="jboss-ejb3-client.jar"/> + </fileset> <fileset dir="${build.lib.dir}"> <include name="jbossws-jboss-integration.jar"/> <include name="jbossws-tomcat-integration.jar"/> @@ -271,10 +279,13 @@ <copy todir="${build.src.samples.dir}/jaxrpc/wssecurity/java"> <fileset dir="${test.java.dir}"> <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/**"/> + <exclude name="org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.java"/> </fileset> </copy> <copy todir="${build.src.samples.dir}/jaxrpc/wssecurity/resources"> - <fileset dir="${test.resources.dir}/jaxrpc/samples/wssecurity"/> + <fileset dir="${test.resources.dir}/jaxrpc/samples/wssecurity"> + <exclude name="store-pass-encrypt/**"/> + </fileset> </copy> <!-- JAXWS samples - - - - - - - - - - - - - - - - - - - - - - --> Modified: trunk/src/ant/build-thirdparty.xml =================================================================== --- trunk/src/ant/build-thirdparty.xml 2006-11-22 13:12:53 UTC (rev 1500) +++ trunk/src/ant/build-thirdparty.xml 2006-11-22 13:27:13 UTC (rev 1501) @@ -28,6 +28,7 @@ <get src="${jboss.repository}/apache-log4j/${apache-log4j}/lib/log4j.jar" dest="${thirdparty.dir}/log4j.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/apache-xalan/${apache-xalan}/lib/serializer.jar" dest="${thirdparty.dir}/serializer.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/apache-xalan/${apache-xalan}/lib/xalan.jar" dest="${thirdparty.dir}/xalan.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/apache-xerces/${apache-xerces}/lib/resolver.jar" dest="${thirdparty.dir}/resolver.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/apache-xerces/${apache-xerces}/lib/xercesImpl.jar" dest="${thirdparty.dir}/xercesImpl.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/apache-xerces/${apache-xerces}/lib/xml-apis.jar" dest="${thirdparty.dir}/xml-apis.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/apache-xmlsec/${apache-xmlsec}/lib/xmlsec.jar" dest="${thirdparty.dir}/xmlsec.jar" usetimestamp="true" verbose="true"/> Modified: trunk/src/main/resources/samples/common/imported-build.xml =================================================================== --- trunk/src/main/resources/samples/common/imported-build.xml 2006-11-22 13:12:53 UTC (rev 1500) +++ trunk/src/main/resources/samples/common/imported-build.xml 2006-11-22 13:27:13 UTC (rev 1501) @@ -30,7 +30,7 @@ <isset property="HAVE_JDK_1.5"/> </and> </condition> - + <!-- JBoss Home --> <condition property="jboss.home" value="${jboss.jdk14.home}"> <not> @@ -43,10 +43,19 @@ <property name="jboss.client" value="${jboss.home}/client"/> <property name="jboss.lib" value="${jboss.home}/lib"/> + <property name="jboss.client" value="${jboss.home}/client"/> <property name="jboss.server" value="${jboss.home}/server/${jboss.server.instance}"/> <property name="jboss.server.lib" value="${jboss.server}/lib"/> <property name="jboss.server.deploy" value="${jboss.server}/deploy"/> + <!-- Java Endorsed --> + <condition property="jbossws.endorsed.dirs" value="${jboss.home}/lib/endorsed"> + <isset property="jbossws.target.server.jboss"/> + </condition> + <condition property="jbossws.endorsed.dirs" value="${tomcat.home}/common/endorsed"> + <isset property="jbossws.target.server.tomcat"/> + </condition> + <!-- Set a hostname property based on COMPUTERNAME for win32, HOSTNAME otherwise and initialize the node0/node1 cluster hostnames to localhost and ${hostname} by default. If you cannot route multicast traffic between @@ -89,11 +98,8 @@ <path id="compile.classpath"> <path refid="client.classpath"/> - <pathelement location="${basedir}/lib/jbossws-jboss-integration.jar"/> - <pathelement location="${basedir}/lib/jbossws-tomcat-integration.jar"/> - <pathelement location="${jboss.server.lib}/jboss.jar"/> - <pathelement location="${jboss.server.deploy}/ejb3.deployer/jboss-annotations-ejb3.jar"/> - <pathelement location="${jboss.server.deploy}/ejb3.deployer/jboss-ejb3x.jar"/> + <pathelement location="${basedir}/lib/${jbossws.version}-jboss-integration.jar"/> + <pathelement location="${basedir}/lib/${jbossws.version}-tomcat-integration.jar"/> </path> <path id="tests.classpath"> @@ -218,8 +224,9 @@ <sysproperty key="jbosstest.host.name" value="${node0}"/> <sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/> <sysproperty key="log.dir" value="${build.test.dir}/log"/> - <sysproperty key="java.endorsed.dirs" value="${jboss.home}/lib/endorsed"/> + <sysproperty key="java.endorsed.dirs" value="${jbossws.endorsed.dirs}"/> <sysproperty key="jbosstest.server.host" value="${node0}"/> + <sysproperty key="jbossws.target.server" value="${jbossws.target.server}"/> <sysproperty key="tomcat.manager.username" value="${tomcat.manager.username}"/> <sysproperty key="tomcat.manager.password" value="${tomcat.manager.password}"/> @@ -261,7 +268,7 @@ <sysproperty key="jbosstest.host.name" value="${node0}"/> <sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/> <sysproperty key="log.dir" value="${build.test.dir}/log"/> - <sysproperty key="java.endorsed.dirs" value="${jboss.home}/lib/endorsed"/> + <sysproperty key="java.endorsed.dirs" value="${jbossws.endorsed.dirs}"/> <sysproperty key="jbosstest.server.host" value="${node0}"/> <sysproperty key="jbossws.target.server" value="${jbossws.target.server}"/> <sysproperty key="tomcat.manager.username" value="${tomcat.manager.username}"/> @@ -281,7 +288,6 @@ </classpath> <formatter type="plain"/> <formatter type="xml"/> - <sysproperty key="java.endorsed.dirs" value="${jboss.home}/lib/endorsed"/> <batchtest fork="yes" todir="${build.test.dir}/reports"> <fileset dir="${java.dir}"> <include name="org/jboss/test/ws/${test}/**/*TestCase.java"/> Modified: trunk/src/main/resources/samples/common/log4j.xml =================================================================== --- trunk/src/main/resources/samples/common/log4j.xml 2006-11-22 13:12:53 UTC (rev 1500) +++ trunk/src/main/resources/samples/common/log4j.xml 2006-11-22 13:27:13 UTC (rev 1501) @@ -59,15 +59,16 @@ <priority value="INFO"/> </category> - <!-- Limit apache axis to INFO as its DEBUG is even more verbose --> - <category name="org.jboss.axis"> + <!-- Limit JBossWS category --> + <category name="org.jboss.ws"> <priority value="DEBUG"/> </category> - - <!-- Limit JBoss webservice category --> - <category name="org.jboss.webservice"> - <priority value="DEBUG"/> + + <!-- + <category name="org.jboss.xb"> + <priority value="TRACE" class="org.jboss.logging.XLevel"/> </category> + --> <!-- ======================= --> <!-- Setup the Root category --> Modified: trunk/src/main/resources/samples/jaxrpc/wssecurity/build.xml =================================================================== --- trunk/src/main/resources/samples/jaxrpc/wssecurity/build.xml 2006-11-22 13:12:53 UTC (rev 1500) +++ trunk/src/main/resources/samples/jaxrpc/wssecurity/build.xml 2006-11-22 13:27:13 UTC (rev 1501) @@ -103,47 +103,6 @@ <include name="wsdl/**"/> </metainf> </jar> - - <!-- jaxrpc-samples-store-pass-encrypt --> - <replace file="${build.test.dir}/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/jboss-wsse-server.xml" token="${buildpath}" value="${build.test.dir}"/> - <war warfile="${build.test.dir}/libs/jaxrpc-samples-store-pass-encrypt.war" webxml="${build.test.dir}/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/WEB-INF/web.xml"> - <classes dir="${build.test.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/HelloJavaBean.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/PasswordUtil.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/UserType.class"/> - </classes> - <webinf dir="${build.test.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="webservices.xml"/> - <include name="wsdl/**"/> - </webinf> - <webinf dir="${build.test.dir}/resources/jaxrpc/samples/wssecurity/store-pass-encrypt"> - <include name="jboss-wsse-server.xml"/> - </webinf> - <webinf dir="${build.test.dir}/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/WEB-INF"> - <include name="jboss-web.xml"/> - </webinf> - <webinf dir="${build.test.dir}/resources/jaxrpc/samples/wssecurity"> - <include name="wsse.keystore"/> - <include name="wsse.truststore"/> - </webinf> - </war> - <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-store-pass-encrypt-client.jar"> - <fileset dir="${build.test.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/UserType.class"/> - </fileset> - <metainf dir="${build.test.dir}/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - <include name="jboss-wsse-client.xml"/> - </metainf> - <metainf dir="${build.test.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF"> - <include name="wsdl/**"/> - <include name="jaxrpc-mapping.xml"/> - </metainf> - </jar> </target> Modified: trunk/src/test/java/org/jboss/test/ws/JBossWSTestHelper.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/JBossWSTestHelper.java 2006-11-22 13:12:53 UTC (rev 1500) +++ trunk/src/test/java/org/jboss/test/ws/JBossWSTestHelper.java 2006-11-22 13:27:13 UTC (rev 1501) @@ -56,14 +56,14 @@ /** True, if -Djbossws.target.server=jboss */ public boolean isTargetServerJBoss() { - String targetServer = System.getProperty("jbossws.target.server"); + String targetServer = getTargetServer(); return "jboss".equals(targetServer); } /** True, if -Djbossws.target.server=tomcat */ public boolean isTargetServerTomcat() { - String targetServer = System.getProperty("jbossws.target.server"); + String targetServer = getTargetServer(); return "tomcat".equals(targetServer); } @@ -88,10 +88,15 @@ } else { - throw new IllegalStateException("Unsupported target server"); + throw new IllegalStateException("Unsupported target server: " + getTargetServer()); } } + private String getTargetServer() + { + return System.getProperty("jbossws.target.server"); + } + /** Try to discover the URL for the deployment archive */ public URL getArchiveURL(String archive) throws MalformedURLException {