Author: thomas.diesler(a)jboss.com Date: 2007-01-10 07:07:49 -0500 (Wed, 10 Jan 2007) New Revision: 1889 Removed: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1427/ trunk/jbossws-tests/src/main/resources/tools/jbws1427/ Modified: trunk/build/ant-import/build-release.xml trunk/build/ant-import/build-thirdparty.xml trunk/build/etc/jbossws-component-info.xml trunk/build/version.properties trunk/integration-tomcat/build.xml trunk/jbossws-core/src/main/resources/samples/common/build-thirdparty.xml trunk/jbossws-docs/user-guide/project/en/modules/installation/install-tomcat.xml trunk/jbossws-tests/build.xml Log: Fix test classpath issues - All pass Modified: trunk/build/ant-import/build-release.xml =================================================================== --- trunk/build/ant-import/build-release.xml 2007-01-10 11:33:49 UTC (rev 1888) +++ trunk/build/ant-import/build-release.xml 2007-01-10 12:07:49 UTC (rev 1889) @@ -210,7 +210,7 @@ <copy todir="${build.bin.dist}/lib/tomcat/common/lib" overwrite="true"> <fileset dir="${thirdparty.dir}"> <include name="activation.jar"/> - <include name="mailapi.jar"/> + <include name="mail.jar"/> </fileset> <fileset dir="${core.output.lib.dir}"> <include name="jbossws-core.jar"/> Modified: trunk/build/ant-import/build-thirdparty.xml =================================================================== --- trunk/build/ant-import/build-thirdparty.xml 2007-01-10 11:33:49 UTC (rev 1888) +++ trunk/build/ant-import/build-thirdparty.xml 2007-01-10 12:07:49 UTC (rev 1889) @@ -57,7 +57,7 @@ <get src="${jboss.repository}/oswego-concurrent/${oswego-concurrent}/lib/concurrent.jar" dest="${thirdparty.dir}/concurrent.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/qdox/${qdox}/lib/qdox.jar" dest="${thirdparty.dir}/qdox.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaf/${sun-jaf}/lib/activation.jar" dest="${thirdparty.dir}/activation.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/sun-javamail/${sun-javamail}/lib/mailapi.jar" dest="${thirdparty.dir}/mailapi.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/sun-javamail/${sun-javamail}/lib/mail.jar" dest="${thirdparty.dir}/mail.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-api.jar" dest="${thirdparty.dir}/jaxb-api.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-impl.jar" dest="${thirdparty.dir}/jaxb-impl.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-xjc.jar" dest="${thirdparty.dir}/jaxb-xjc.jar" usetimestamp="true" verbose="true"/> @@ -71,61 +71,53 @@ <target name="thirdparty-classpath" > - <!-- The thirdparty jars for a jbossws client --> - <path id="jbossws.thirdparty.classpath"> - <pathelement location="${thirdparty.dir}/activation.jar"/> - <pathelement location="${thirdparty.dir}/commons-logging.jar"/> - <pathelement location="${thirdparty.dir}/concurrent.jar"/> + <!-- The compile classpath for jbossws core --> + <path id="core.classpath"> + <pathelement location="${thirdparty.dir}/ejb3.deployer/jboss-annotations-ejb3.jar"/> + <pathelement location="${thirdparty.dir}/ejb3.deployer/jboss-ejb3x.jar"/> <pathelement location="${thirdparty.dir}/javassist.jar"/> <pathelement location="${thirdparty.dir}/jaxb-api.jar"/> - <pathelement location="${thirdparty.dir}/jaxb-impl.jar"/> + <pathelement location="${thirdparty.dir}/jaxb-xjc.jar"/> <pathelement location="${thirdparty.dir}/jboss-common-core.jar"/> - <pathelement location="${thirdparty.dir}/jboss-container.jar"/> + <pathelement location="${thirdparty.dir}/jboss-dependency.jar"/> <pathelement location="${thirdparty.dir}/jboss-j2ee.jar"/> - <pathelement location="${thirdparty.dir}/jboss-logging-log4j.jar"/> <pathelement location="${thirdparty.dir}/jboss-logging-spi.jar"/> + <pathelement location="${thirdparty.dir}/jboss-microcontainer.jar"/> <pathelement location="${thirdparty.dir}/jboss-remoting.jar"/> <pathelement location="${thirdparty.dir}/jboss-security-spi.jar"/> <pathelement location="${thirdparty.dir}/jboss-xml-binding.jar"/> - <pathelement location="${thirdparty.dir}/log4j.jar"/> - <pathelement location="${thirdparty.dir}/mailapi.jar"/> + <pathelement location="${thirdparty.dir}/mail.jar"/> + <pathelement location="${thirdparty.dir}/servlet-api.jar"/> + <pathelement location="${thirdparty.dir}/stax-api-1.0.jar"/> <pathelement location="${thirdparty.dir}/wsdl4j.jar"/> + <pathelement location="${thirdparty.dir}/wstx-lgpl-2.0.6.jar"/> <pathelement location="${thirdparty.dir}/xmlsec.jar"/> + <pathelement location="${thirdparty.dir}/xercesImpl.jar"/> <pathelement location="${thirdparty.dir}/xalan.jar"/> </path> - - <!-- The compile classpath for jbossws core --> - <path id="core.classpath"> - <path refid="jbossws.thirdparty.classpath"/> - <pathelement location="${thirdparty.dir}/ejb3.deployer/jboss-annotations-ejb3.jar"/> - <pathelement location="${thirdparty.dir}/ejb3.deployer/jboss-ejb3x.jar"/> - <pathelement location="${thirdparty.dir}/jaxb-xjc.jar"/> - <pathelement location="${thirdparty.dir}/jboss-dependency.jar"/> - <pathelement location="${thirdparty.dir}/jboss-microcontainer.jar"/> - <pathelement location="${thirdparty.dir}/servlet-api.jar"/> - <pathelement location="${thirdparty.dir}/stax-api-1.0.jar"/> - <pathelement location="${thirdparty.dir}/wstx-lgpl-2.0.6.jar"/> - </path> <!-- The compile classpath for jboss50 integration --> <path id="jboss50.integration.classpath"> - <path refid="core.classpath"/> - <pathelement location="${thirdparty.dir}/ejb3.deployer/jboss-ejb3.jar"/> - <pathelement location="${thirdparty.dir}/jboss-deployers.jar"/> - <pathelement location="${thirdparty.dir}/jboss-vfs.jar"/> + <pathelement location="${jboss50.lib}/jboss-aop-jdk50.jar"/> + <pathelement location="${jboss50.lib}/jboss-deployers.jar"/> <pathelement location="${jboss50.lib}/jboss-j2se.jar"/> + <pathelement location="${jboss50.lib}/jboss-vfs.jar"/> <pathelement location="${jboss50.server.lib}/jboss.jar"/> - <pathelement location="${jboss50.server.deployers}/jboss-aop-jboss5.deployer/jboss-aop-jdk50.jar"/> + <pathelement location="${jboss50.server.deployers}/jboss-aop-jboss5.deployer/jboss-aspect-library-jdk50.jar"/> + <pathelement location="${jboss50.server.deployers}/ejb3.deployer/jboss-annotations-ejb3.jar"/> + <pathelement location="${jboss50.server.deployers}/ejb3.deployer/jboss-ejb3.jar"/> + <pathelement location="${jboss50.server.deployers}/ejb3.deployer/jboss-ejb3x.jar"/> + <path refid="core.classpath"/> </path> <!-- The compile classpath for jboss42 integration --> <path id="jboss42.integration.classpath"> - <path refid="core.classpath"/> - <pathelement location="${thirdparty.dir}/ejb3.deployer/jboss-ejb3.jar"/> <pathelement location="${jboss42.lib}/jboss-jmx.jar"/> <pathelement location="${jboss42.lib}/jboss-system.jar"/> <pathelement location="${jboss42.server.lib}/jboss.jar"/> <pathelement location="${jboss42.server.deploy}/jboss-aop-jdk50.deployer/jboss-aop-jdk50.jar"/> + <pathelement location="${jboss42.server.deploy}/ejb3.deployer/jboss-ejb3.jar"/> + <path refid="core.classpath"/> </path> <!-- The compile classpath for jboss42 integration --> Modified: trunk/build/etc/jbossws-component-info.xml =================================================================== --- trunk/build/etc/jbossws-component-info.xml 2007-01-10 11:33:49 UTC (rev 1888) +++ trunk/build/etc/jbossws-component-info.xml 2007-01-10 12:07:49 UTC (rev 1889) @@ -25,6 +25,7 @@ </import> <import componentref="jboss/jbossxb"> <compatible version="@jboss-jbossxb@"/> + <compatible version="snapshot"/> </import> <import componentref="jboss/microcontainer"> <compatible version="1.0.2"/> Modified: trunk/build/version.properties =================================================================== --- trunk/build/version.properties 2007-01-10 11:33:49 UTC (rev 1888) +++ trunk/build/version.properties 2007-01-10 12:07:49 UTC (rev 1889) @@ -17,7 +17,7 @@ apache-xmlsec=1.3.0 ibm-wsdl4j=1.5.2jboss javassist=3.4.GA -jboss-jbossxb=snapshot +jboss-jbossxb=1.0.0.CR8 jboss-microcontainer=snapshot jboss-remoting=2.0.0.GA sun-jaxb=2.0.3 @@ -28,9 +28,9 @@ apache-logging=1.0.5.GA-jboss apache-xalan=j_2.7.0 apache-xerces=2.7.1 -hibernate=3.2.0.CR2 +hibernate=3.2.1.GA jboss-backport-concurrent=2.1.0.GA -jboss-common-core=2.0.2.CR1 +jboss-common-core=2.0.4.Alpha jboss-common-logging-log4j=2.0.2.GA jboss-common-logging-spi=2.0.2.GA jboss-ejb3=1.0.0.CR9-jboss4.0.5 @@ -41,10 +41,10 @@ jbpm-bpel=1.1.Beta2 junit=3.8.1 oswego-concurrent=1.3.4 -qdox=1.4 +qdox=1.6 stax-api=1.0 -sun-jaf=1.0.2 -sun-javamail=1.3.1 +sun-jaf=1.1 +sun-javamail=1.4 sun-servlet=2.4 woodstox=2.0.6 wscommons-policy=1.0 Modified: trunk/integration-tomcat/build.xml =================================================================== --- trunk/integration-tomcat/build.xml 2007-01-10 11:33:49 UTC (rev 1888) +++ trunk/integration-tomcat/build.xml 2007-01-10 12:07:49 UTC (rev 1889) @@ -142,7 +142,7 @@ <copy todir="${tomcat.common.dir}/endorsed" file="${thirdparty.dir}/xercesImpl.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"/> + <copy todir="${tomcat.common.dir}/lib" file="${thirdparty.dir}/mail.jar"/> <copy todir="${tomcat.common.dir}/lib" file="${core.output.lib.dir}/jbossws-client.jar" overwrite="true"/> <copy todir="${tomcat.common.dir}/lib" file="${tomcat.output.lib.dir}/jbossws-tomcat-integration.jar" overwrite="true"/> <copy todir="${tomcat.common.dir}/lib" file="${tomcat.output.lib.dir}/jbossws-thirdparty.jar" overwrite="true"/> Modified: trunk/jbossws-core/src/main/resources/samples/common/build-thirdparty.xml =================================================================== --- trunk/jbossws-core/src/main/resources/samples/common/build-thirdparty.xml 2007-01-10 11:33:49 UTC (rev 1888) +++ trunk/jbossws-core/src/main/resources/samples/common/build-thirdparty.xml 2007-01-10 12:07:49 UTC (rev 1889) @@ -42,7 +42,7 @@ <get src="${jboss.repository}/sun-jaf/${sun-jaf}/lib/activation.jar" dest="${thirdparty.dir}/activation.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-api.jar" dest="${thirdparty.dir}/jaxb-api.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-impl.jar" dest="${thirdparty.dir}/jaxb-impl.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/sun-javamail/${sun-javamail}/lib/mailapi.jar" dest="${thirdparty.dir}/mailapi.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/sun-javamail/${sun-javamail}/lib/mail.jar" dest="${thirdparty.dir}/mail.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-servlet/${sun-servlet}/lib/servlet-api.jar" dest="${thirdparty.dir}/servlet-api.jar" usetimestamp="true" verbose="true"/> <unzip dest="${thirdparty.dir}" src="${thirdparty.dir}/ejb3.deployer.zip"/> </target> @@ -66,7 +66,7 @@ <pathelement location="${thirdparty.dir}/jboss-security-spi.jar"/> <pathelement location="${thirdparty.dir}/jboss-xml-binding.jar"/> <pathelement location="${thirdparty.dir}/log4j.jar"/> - <pathelement location="${thirdparty.dir}/mailapi.jar"/> + <pathelement location="${thirdparty.dir}/mail.jar"/> <pathelement location="${thirdparty.dir}/wsdl4j.jar"/> <pathelement location="${thirdparty.dir}/xmlsec.jar"/> @@ -83,7 +83,7 @@ <pathelement location="${thirdparty.dir}/ejb3.deployer/jboss-ejb3x.jar"/> <pathelement location="${thirdparty.dir}/ejb3.deployer/jboss-ejb3.jar"/> <pathelement location="${thirdparty.dir}/jboss-j2ee.jar"/> - <pathelement location="${thirdparty.dir}/mailapi.jar"/> + <pathelement location="${thirdparty.dir}/mail.jar"/> </path> <path id="tests.classpath"> Modified: trunk/jbossws-docs/user-guide/project/en/modules/installation/install-tomcat.xml =================================================================== --- trunk/jbossws-docs/user-guide/project/en/modules/installation/install-tomcat.xml 2007-01-10 11:33:49 UTC (rev 1888) +++ trunk/jbossws-docs/user-guide/project/en/modules/installation/install-tomcat.xml 2007-01-10 12:07:49 UTC (rev 1889) @@ -34,7 +34,7 @@ <listitem>jboss-jaxrpc.jar</listitem> <listitem>jboss-jaxws.jar</listitem> <listitem>jboss-saaj.jar</listitem> - <listitem>mailapi.jar</listitem> + <listitem>mail.jar</listitem> </itemizedlist> </para> </listitem> Modified: trunk/jbossws-tests/build.xml =================================================================== --- trunk/jbossws-tests/build.xml 2007-01-10 11:33:49 UTC (rev 1888) +++ trunk/jbossws-tests/build.xml 2007-01-10 12:07:49 UTC (rev 1889) @@ -104,13 +104,6 @@ <target name="prepare"> - <echo message="-----------------------------------------------"/> - <echo message="jboss.home = ${jboss.home}"/> - <echo message="tomcat.home = ${tomcat.home}"/> - <echo message="java.home = ${java.home}"/> - <echo message="endorsed.dirs = ${endorsed.dirs}"/> - <echo message="-----------------------------------------------"/> - <available property="jbossws.available" file="${jboss.home}/client/jbossall-client.jar"/> <available property="installer.setup" file="jboss-ejb3-client.jar"/> @@ -121,13 +114,6 @@ <format property="build.id" pattern="yyyyMMddHHmm"/> </tstamp> - </target> - - <!-- - Init the various classpaths - --> - <target name="init" depends="prepare,thirdparty"> - <!-- Define the jbossws.build --> <condition property="jbossws.build" value="jbossws14"> <not> @@ -146,22 +132,33 @@ </condition> <property name="excludes-short-name" value="tests-${jbossws.integration.target}-excludes.txt"/> <property name="tests.excludefile" value="${tests.resources.dir}/${excludes-short-name}"/> + + <echo/> + <echo message="-----------------------------------------------"/> + <echo message="jboss.home = ${jboss.home}"/> + <echo message="tomcat.home = ${tomcat.home}"/> + <echo message="java.home = ${java.home}"/> + <echo message="endorsed = ${endorsed.dirs}"/> <echo message="excludefile = ${excludes-short-name}"/> + <echo message="-----------------------------------------------"/> - <!-- The jbossws client classpath --> - <path id="jbossws.client.classpath"> - <path refid="jbossws.thirdparty.classpath"/> + </target> + + <!-- + Init the various classpaths + --> + <target name="init" depends="prepare,thirdparty,init-jboss50-classpath"> + </target> + + <target name="init-jboss50-classpath" depends="prepare"> + + <!-- The combined compile classpath --> + <path id="javac.classpath"> + <path refid="core.classpath"/> <pathelement location="${core.output.lib.dir}/jbossws-client.jar"/> <pathelement location="${core.output.lib.dir}/jboss-jaxrpc.jar"/> <pathelement location="${core.output.lib.dir}/jboss-jaxws.jar"/> <pathelement location="${core.output.lib.dir}/jboss-saaj.jar"/> - </path> - - <!-- The combined compile classpath --> - <path id="javac.classpath"> - <path refid="jbossws.client.classpath"/> - <pathelement location="${thirdparty.dir}/ejb3.deployer/jboss-annotations-ejb3.jar"/> - <pathelement location="${thirdparty.dir}/ejb3.deployer/jboss-ejb3x.jar"/> <pathelement location="${thirdparty.dir}/jboss-vfs.jar"/> <pathelement location="${thirdparty.dir}/qdox.jar"/> <pathelement location="${thirdparty.dir}/policy-1.0.jar"/> @@ -172,13 +169,14 @@ <!-- The test client classpath --> <path id="test.client.classpath"> - <path refid="jbossws.client.classpath"/> <pathelement location="${jboss.client}/jbossall-client.jar"/> <pathelement location="${jboss.client}/jboss-ejb3-client.jar"/> <pathelement location="${jboss.client}/jboss-aop-jdk50-client.jar"/> <pathelement location="${jboss.client}/jboss-aspect-jdk50-client.jar"/> - <pathelement location="${jboss.server.lib}/jbosssx.jar"/> <!-- JBossSecurityContext --> - <pathelement location="${basedir}/../integration-${jbossws.integration.target}/output/lib/jbossws-${jbossws.integration.target}-integration.jar"/> + <pathelement location="${jboss.server.lib}/jbosssx.jar"/> + <pathelement location="${jboss.lib}/jboss-vfs.jar"/> + <pathelement location="${integration.jboss50.dir}/output/lib/jbossws-jboss50-integration.jar"/> + <pathelement location="${integration.jboss42.dir}/output/lib/jbossws-jboss42-integration.jar"/> <pathelement location="${integration.tomcat.dir}/output/lib/jbossws-tomcat-integration.jar"/> <path refid="javac.classpath"/> </path> @@ -259,7 +257,9 @@ --> <target name="generate-sources" depends="compile" description="Generate the deployment resources."> <taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools"> - <classpath refid="jbossws.client.classpath"/> + <classpath refid="core.classpath"/> + <classpath location="${core.output.lib.dir}/jbossws-client.jar"/> + <classpath location="${thirdparty.dir}/concurrent.jar"/> <classpath location="${tests.output.dir}/classes"/> <classpath location="${tests.output.dir}"/> </taskdef>