Author: thomas.diesler(a)jboss.com Date: 2007-03-12 18:15:59 -0400 (Mon, 12 Mar 2007) New Revision: 2603 Added: trunk/build/etc/component-info/ trunk/build/etc/component-info/jbossws-core.xml Removed: trunk/build/etc/jbossws-component-info.xml trunk/build/etc/jbossws-component-info14.xml Modified: trunk/build/ant-import/build-deploy.xml trunk/build/ant-import/build-release.xml trunk/build/ant-import/build-setup.xml trunk/build/dist/ant.properties.example trunk/integration-jboss40/build.xml trunk/integration-jboss42/build.xml trunk/integration-jboss50/build.xml trunk/integration-tomcat/build.xml trunk/jbossws-core/build.xml trunk/jbossws-core/src/java/org/jboss/ws/core/client/ServiceRefHandlerImpl.java trunk/jbossws-tests/ant-import/build-samples-jaxrpc.xml Log: Use a repository entry per IL Modified: trunk/build/ant-import/build-deploy.xml =================================================================== --- trunk/build/ant-import/build-deploy.xml 2007-03-12 17:10:29 UTC (rev 2602) +++ trunk/build/ant-import/build-deploy.xml 2007-03-12 22:15:59 UTC (rev 2603) @@ -46,7 +46,7 @@ <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/> <copy todir="${jboss50.home}/bin" overwrite="true"> - <fileset dir="${etc.dir}"> + <fileset dir="${build.etc.dir}"> <include name="*.bat"/> <include name="*.sh"/> </fileset> @@ -94,7 +94,7 @@ <fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/> <copy todir="${jboss42.home}/bin" overwrite="true"> - <fileset dir="${etc.dir}"> + <fileset dir="${build.etc.dir}"> <include name="*.bat"/> <include name="*.sh"/> </fileset> @@ -139,7 +139,7 @@ <fail message="Not available: ${jboss40.available.file}" unless="jboss40.available"/> <copy todir="${jboss40.home}/bin" overwrite="true"> - <fileset dir="${etc.dir}"> + <fileset dir="${build.etc.dir}"> <include name="*.bat" /> <include name="*.sh" /> </fileset> @@ -188,7 +188,7 @@ <fail message="Not available: ${jboss40.available.file}" unless="jboss40.available"/> <copy todir="${jboss40.home}/bin" overwrite="true"> - <fileset dir="${etc.dir}"> + <fileset dir="${build.etc.dir}"> <include name="*.bat" /> <include name="*.sh" /> </fileset> Modified: trunk/build/ant-import/build-release.xml =================================================================== --- trunk/build/ant-import/build-release.xml 2007-03-12 17:10:29 UTC (rev 2602) +++ trunk/build/ant-import/build-release.xml 2007-03-12 22:15:59 UTC (rev 2603) @@ -42,13 +42,15 @@ <target name="release-to-repository" depends="core-jars,jboss50-jars,jboss42-jars,jboss40-jars,jboss40-jars14" description="Release to jboss.local.repository"> - <!-- jbossws --> - <property name="jbossws.repository.dir" value="${jboss.local.repository}/jboss/jbossws/${repository.id}"/> - <mkdir dir="${jbossws.repository.dir}/lib"/> + <!-- jboss/jbossws --> + <property name="jboss.repository.dir" value="${jboss.local.repository}/jboss"/> + <mkdir dir="${jboss.repository.dir}/jbossws/${repository.id}/lib"/> + <mkdir dir="${jboss.repository.dir}/jbossws-jboss50/${repository.id}/lib"/> <delete> - <fileset dir="${jbossws.repository.dir}/lib"/> + <fileset dir="${jboss.repository.dir}/jbossws/${repository.id}/lib"/> + <fileset dir="${jboss.repository.dir}/jbossws-jboss50/${repository.id}/lib"/> </delete> - <copy todir="${jbossws.repository.dir}/lib" overwrite="true"> + <copy todir="${jboss.repository.dir}/jbossws/${repository.id}/lib" overwrite="true"> <fileset dir="${core.output.lib.dir}"> <include name="jbossws-integration.jar"/> <include name="jbossws-client.jar"/> @@ -57,48 +59,25 @@ <include name="jboss-jaxws.jar"/> <include name="jboss-saaj.jar"/> </fileset> - <fileset dir="${jboss50.output.lib.dir}"> - <include name="jbossws50.sar"/> - <include name="jbossws50-deployer.zip"/> - </fileset> - <!-- - <fileset dir="${jboss42.output.lib.dir}"> - <include name="jbossws42.sar"/> - </fileset> - <fileset dir="${jboss40.output.lib.dir}"> - <include name="jbossws40.sar"/> - </fileset> - --> </copy> - <copy tofile="${jbossws.repository.dir}/component-info.xml" file="${etc.dir}/jbossws-component-info.xml" filtering="true" overwrite="true"> + <copy tofile="${jboss.repository.dir}/jbossws/${repository.id}/component-info.xml" file="${build.etc.dir}/component-info/jbossws-core.xml" filtering="true" overwrite="true"> <filterset> <filtersfile file="${build.dir}/version.properties"/> </filterset> </copy> - <!-- jbossws14 - <property name="jbossws14.repository.dir" value="${jboss.local.repository}/jboss/jbossws14/${repository.id}"/> - <mkdir dir="${jbossws14.repository.dir}/lib"/> - <delete> - <fileset dir="${jbossws14.repository.dir}/lib"/> - </delete> - <copy todir="${jbossws14.repository.dir}/lib" overwrite="true"> - <fileset dir="${core.output.lib.dir}"> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-saaj.jar"/> + <!-- jboss/jbossws-jboss50 --> + <copy todir="${jboss.repository.dir}/jbossws-jboss50/${repository.id}/lib" overwrite="true"> + <fileset dir="${jboss50.output.lib.dir}"> + <include name="jbossws50.sar"/> + <include name="jbossws50-deployer.zip"/> </fileset> - <fileset dir="${jboss40.output.lib.dir}"> - <include name="jbossws40-jdk14.sar"/> - <include name="jbossws14-client.jar"/> - <include name="jboss-jaxws14.jar"/> - </fileset> </copy> - <copy tofile="${jbossws14.repository.dir}/component-info.xml" file="${etc.dir}/jbossws-component-info14.xml" filtering="true" overwrite="true"> + <copy tofile="${jboss.repository.dir}/jbossws-jboss50/${repository.id}/component-info.xml" file="${build.etc.dir}/component-info/integration-jboss50.xml" filtering="true" overwrite="true"> <filterset> <filtersfile file="${build.dir}/version.properties"/> </filterset> </copy> - --> </target> @@ -114,14 +93,6 @@ <property name="portal.userguide" value="${portal.freezone}/user-guide"/> <property name="portal.downloads" value="${jbossws.portal.content}/downloads"/> - <!-- Copy user guide - <copy todir="${portal.userguide}" overwrite="true"> - <fileset dir="${docs.userguide.dir}/build"> - <include name="en/**"/> - </fileset> - </copy> - --> - <!-- Copy downloads --> <copy todir="${portal.downloads}" overwrite="true"> <fileset dir="${build.output.dir}"> @@ -144,6 +115,7 @@ <target name="build-bin-dist" depends="core-jars,jboss50-jars,jboss42-jars,jboss40-jars,jboss40-jars14,tomcat-jars,build-samples,build-javadoc" description="Build the binary distribution"> + <property name="install.bin.dir" value="${build.bin.dist}/install/bin"/> <property name="install.etc.dir" value="${build.bin.dist}/install/etc"/> <property name="install.core.dir" value="${build.bin.dist}/install/jbossws-core"/> <property name="install.jboss40.dir" value="${build.bin.dist}/install/integration-jboss40"/> @@ -160,7 +132,7 @@ <mkdir dir="${install.tomcat.dir}"/> <mkdir dir="${install.thirdparty.dir}"/> - <copy todir="${build.bin.dist}" file="${etc.dir}/JBossORG-EULA.txt" overwrite="true"/> + <copy todir="${build.bin.dist}" file="${build.etc.dir}/JBossORG-EULA.txt" overwrite="true"/> <copy todir="${build.bin.dist}" filtering="true" overwrite="true"> <fileset dir="${build.dir}/dist"/> <filterset> @@ -175,22 +147,20 @@ <!-- javadoc --> <copy todir="${build.bin.dist}" file="${build.output.dir}/jbossws-${version.id}-api.zip" overwrite="true"/> - <!-- Install etc --> - <copy todir="${install.etc.dir}"> - <fileset dir="${etc.dir}"> + <!-- bin --> + <copy todir="${install.bin.dir}"> + <fileset dir="${build.etc.dir}"> <include name="*.bat"/> <include name="*.sh"/> </fileset> </copy> - <!-- documentation - <copy todir="${build.bin.dist}/docs/html" overwrite="true"> - <fileset dir="${docs.userguide.dir}/build/en/html"/> + <!-- etc --> + <copy todir="${install.etc.dir}"> + <fileset dir="${build.etc.dir}"> + <include name="JBossORG-EULA.txt"/> + </fileset> </copy> - <copy todir="${build.bin.dist}/docs" overwrite="true"> - <fileset dir="${docs.userguide.dir}/build/en/pdf"/> - </copy> - --> <!-- Install Core --> <copy todir="${install.core.dir}" overwrite="true"> Modified: trunk/build/ant-import/build-setup.xml =================================================================== --- trunk/build/ant-import/build-setup.xml 2007-03-12 17:10:29 UTC (rev 2602) +++ trunk/build/ant-import/build-setup.xml 2007-03-12 22:15:59 UTC (rev 2603) @@ -31,8 +31,7 @@ <property name="core.dir" value="${basedir}/../jbossws-core"/> <property name="tests.dir" value="${basedir}/../jbossws-tests"/> - <property name="etc.dir" value="${build.dir}/output/etc"/> - <property name="docs.userguide.dir" value="${docs.dir}/user-guide/project"/> + <property name="build.etc.dir" value="${build.dir}/output/etc"/> <property name="thirdparty.dir" value="${build.dir}/thirdparty"/> <property name="jboss50.lib" value="${jboss50.home}/lib"/> Modified: trunk/build/dist/ant.properties.example =================================================================== --- trunk/build/dist/ant.properties.example 2007-03-12 17:10:29 UTC (rev 2602) +++ trunk/build/dist/ant.properties.example 2007-03-12 22:15:59 UTC (rev 2603) @@ -5,7 +5,7 @@ # Optional JBoss Home #jboss50.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta2 -#jboss42.home=/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.CR1 +#jboss42.home=/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.GA #jboss40.home=/home/tdiesler/svn/jbossas/branches/Branch_4_0/build/output/jboss-4.0.5.SP1-ejb3 # The JBoss server instance Added: trunk/build/etc/component-info/jbossws-core.xml =================================================================== --- trunk/build/etc/component-info/jbossws-core.xml (rev 0) +++ trunk/build/etc/component-info/jbossws-core.xml 2007-03-12 22:15:59 UTC (rev 2603) @@ -0,0 +1,44 @@ +<project name="jboss/jbossws"> + + <component id="jboss/jbossws" + description="JBossWS an implementation of J2EE Web Services" + version=&quot;@repository.id(a)&quot; + licenseType="lgpl"> + + <artifact id="jbossws-integration.jar"/> + <artifact id="jbossws-client.jar"/> + <artifact id="jbossws-core.jar"/> + <artifact id="jboss-jaxrpc.jar"/> + <artifact id="jboss-jaxws.jar"/> + <artifact id="jboss-saaj.jar"/> + + <import componentref="apache-xmlsec"> + <compatible version="@apache-xmlsec@"/> + <compatible version="@apache-xmlsec@-brew"/> + </import> + <import componentref="ibm-wsdl4j"> + <compatible version="@ibm-wsdl4j@"/> + <compatible version="@ibm-wsdl4j@-brew"/> + </import> + <import componentref="javassist"> + <compatible version="@javassist@"/> + <compatible version="@javassist@-brew"/> + </import> + <import componentref="jbpm/bpel"> + <compatible version="@jbpm-bpel@"/> + </import> + <import componentref="sun-jaxb"> + <compatible version="@sun-jaxb@"/> + </import> + + <export> + <include input="jbossws-integration.jar"/> + <include input="jbossws-core.jar"/> + <include input="jboss-jaxrpc.jar"/> + <include input="jboss-jaxws.jar"/> + <include input="jboss-saaj.jar"/> + </export> + + </component> + +</project> Property changes on: trunk/build/etc/component-info/jbossws-core.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Deleted: trunk/build/etc/jbossws-component-info.xml =================================================================== --- trunk/build/etc/jbossws-component-info.xml 2007-03-12 17:10:29 UTC (rev 2602) +++ trunk/build/etc/jbossws-component-info.xml 2007-03-12 22:15:59 UTC (rev 2603) @@ -1,56 +0,0 @@ -<project name="jboss/jbossws-component-info"> - - <component id="jboss/jbossws" licenseType="lgpl" version=&quot;@repository.id(a)&quot; description="JBossWS an implementation of J2EE Web Services"> - - <artifact id="jbossws-integration.jar"/> - <artifact id="jbossws-client.jar"/> - <artifact id="jbossws-core.jar"/> - <artifact id="jboss-jaxrpc.jar"/> - <artifact id="jboss-jaxws.jar"/> - <artifact id="jboss-saaj.jar"/> - - <!-- - <artifact id="jbossws40.sar"/> - <artifact id="jbossws42.sar"/> - --> - <artifact id="jbossws50.sar"/> - <artifact id="jbossws50-deployer.zip"/> - - <import componentref="apache-xmlsec"> - <compatible version="@apache-xmlsec@"/> - <compatible version="@apache-xmlsec@-brew"/> - </import> - <import componentref="ibm-wsdl4j"> - <compatible version="@ibm-wsdl4j@"/> - </import> - <import componentref="javassist"> - <compatible version="@javassist@"/> - <compatible version="@javassist@-brew"/> - </import> - <import componentref="jbpm/bpel"> - <compatible version="@jbpm-bpel@"/> - </import> - <import componentref="jboss/jbossxb"> - <compatible version="@jboss-jbossxb@"/> - </import> - <import componentref="jboss/microcontainer"> - <compatible version="@jboss-microcontainer@"/> - </import> - <import componentref="jboss/remoting"> - <compatible version="@jboss-remoting@"/> - </import> - <import componentref="sun-jaxb"> - <compatible version="@sun-jaxb@"/> - </import> - - <export> - <include input="jbossws-integration.jar"/> - <include input="jbossws-core.jar"/> - <include input="jboss-jaxrpc.jar"/> - <include input="jboss-jaxws.jar"/> - <include input="jboss-saaj.jar"/> - </export> - - </component> - -</project> Deleted: trunk/build/etc/jbossws-component-info14.xml =================================================================== --- trunk/build/etc/jbossws-component-info14.xml 2007-03-12 17:10:29 UTC (rev 2602) +++ trunk/build/etc/jbossws-component-info14.xml 2007-03-12 22:15:59 UTC (rev 2603) @@ -1,48 +0,0 @@ -<project name="jboss/jbossws-component-info"> - - <component id="jboss/jbossws14" licenseType="lgpl" version=&quot;@repository.id(a)&quot; - description="JBossWS an implementation of J2EE Web Services - Retrotranslated"> - - <artifact id="jbossws14-client.jar"/> - <artifact id="jboss-jaxws14.jar"/> - <artifact id="jboss-jaxrpc.jar"/> - <artifact id="jboss-saaj.jar"/> - - <artifact id="jbossws40-jdk14.sar"/> - - <import componentref="apache-xmlsec"> - <compatible version="@apache-xmlsec@"/> - </import> - <import componentref="ibm-wsdl4j"> - <compatible version="@ibm-wsdl4j@"/> - </import> - <import componentref="javassist"> - <compatible version="@javassist@"/> - </import> - <import componentref="jbpm/bpel"> - <compatible version="@jbpm-bpel@"/> - </import> - <import componentref="jboss/jbossretro"> - <compatible version="@jboss-jbossretro@"/> - </import> - <import componentref="jboss/jbossxb"> - <compatible version="@jboss-jbossxb@"/> - </import> - <import componentref="jboss/microcontainer"> - <compatible version="@jboss-microcontainer@"/> - </import> - <import componentref="jboss/remoting"> - <compatible version="1.4.3.GA"/> - <compatible version="@jboss-remoting@"/> - </import> - - <export> - <include input="jbossws14-client.jar"/> - <include input="jboss-jaxws14.jar"/> - <include input="jboss-jaxrpc.jar"/> - <include input="jboss-saaj.jar"/> - </export> - - </component> - -</project> \ No newline at end of file Modified: trunk/integration-jboss40/build.xml =================================================================== --- trunk/integration-jboss40/build.xml 2007-03-12 17:10:29 UTC (rev 2602) +++ trunk/integration-jboss40/build.xml 2007-03-12 22:15:59 UTC (rev 2603) @@ -149,7 +149,7 @@ <!-- Build jbossws-jboss40-integration.jar --> <mkdir dir="${jboss40.output.lib.dir}"/> - <jar jarfile="${jboss40.output.lib.dir}/jbossws-jboss40-integration.jar" manifest="${etc.dir}/default.mf"> + <jar jarfile="${jboss40.output.lib.dir}/jbossws-jboss40-integration.jar" manifest="${build.etc.dir}/default.mf"> <fileset dir="${jboss40.output.classes.dir}"> <include name="org/jboss/ws/integration/jboss42/**"/> <include name="org/jboss/ws/integration/jboss40/**"/> @@ -169,7 +169,7 @@ </war> <!-- Build jbossws40.sar --> - <jar jarfile="${jboss40.output.lib.dir}/jbossws40.sar" manifest="${etc.dir}/default.mf"> + <jar jarfile="${jboss40.output.lib.dir}/jbossws40.sar" manifest="${build.etc.dir}/default.mf"> <fileset dir="${jboss40.output.lib.dir}"> <include name="jbossws-jboss40-integration.jar"/> <include name="jbossws-context.war"/> @@ -209,7 +209,7 @@ <!-- Build jbossws14-core.jar --> <mkdir dir="${jboss40.output.lib.dir}"/> - <jar jarfile="${jboss40.output.lib.dir}/jbossws14-core.jar" manifest="${etc.dir}/default.mf"> + <jar jarfile="${jboss40.output.lib.dir}/jbossws14-core.jar" manifest="${build.etc.dir}/default.mf"> <fileset dir="${jboss40.output.classes14.dir}"> <include name="org/jboss/ws/**"/> </fileset> @@ -221,7 +221,7 @@ <!-- Build jboss-jaxws14.jar --> <mkdir dir="${jboss40.output.lib.dir}"/> - <jar jarfile="${jboss40.output.lib.dir}/jboss-jaxws14.jar" manifest="${etc.dir}/default.mf"> + <jar jarfile="${jboss40.output.lib.dir}/jboss-jaxws14.jar" manifest="${build.etc.dir}/default.mf"> <fileset dir="${jboss40.output.classes14.dir}"> <include name="javax/jws/**"/> <include name="javax/xml/ws/**"/> @@ -229,7 +229,7 @@ </jar> <!-- Build jbossws14-jboss40-integration.jar --> - <jar jarfile="${jboss40.output.lib.dir}/jbossws14-jboss40-integration.jar" manifest="${etc.dir}/default.mf"> + <jar jarfile="${jboss40.output.lib.dir}/jbossws14-jboss40-integration.jar" manifest="${build.etc.dir}/default.mf"> <fileset dir="${jboss40.output.classes14.dir}"> <include name="org/jboss/ws/integration/jboss42/**"/> <include name="org/jboss/ws/integration/jboss40/**"/> @@ -238,7 +238,7 @@ </jar> <!-- Build jbossws14-client.jar --> - <jar jarfile="${jboss40.output.lib.dir}/jbossws14-client.jar" manifest="${etc.dir}/default.mf"> + <jar jarfile="${jboss40.output.lib.dir}/jbossws14-client.jar" manifest="${build.etc.dir}/default.mf"> <fileset dir="${core.output.classes14.dir}"> <include name="javax/xml/rpc/**"/> <include name="javax/xml/soap/**"/> @@ -256,7 +256,7 @@ <include name="schema/**"/> <include name="dtd/**"/> </fileset> - <fileset dir="${etc.dir}"> + <fileset dir="${build.etc.dir}"> <include name="wstools.sh"/> <include name="wstools.bat"/> <include name="wstools-log4j.xml"/> @@ -269,7 +269,7 @@ file="${jboss40.resources.dir}/jbossws.sar/META-INF/jboss-service-no-ejb3.xml"/> <!-- Build jbossws40-jdk14.sar --> - <jar jarfile="${jboss40.output.lib.dir}/jbossws40-jdk14.sar" manifest="${etc.dir}/default.mf"> + <jar jarfile="${jboss40.output.lib.dir}/jbossws40-jdk14.sar" manifest="${build.etc.dir}/default.mf"> <fileset dir="${jboss40.output.lib.dir}"> <include name="jbossws14-jboss40-integration.jar"/> <include name="jbossws-context.war"/> Modified: trunk/integration-jboss42/build.xml =================================================================== --- trunk/integration-jboss42/build.xml 2007-03-12 17:10:29 UTC (rev 2602) +++ trunk/integration-jboss42/build.xml 2007-03-12 22:15:59 UTC (rev 2603) @@ -99,7 +99,7 @@ <!-- Build jbossws-jboss42-integration.jar --> <mkdir dir="${jboss42.output.lib.dir}"/> - <jar jarfile="${jboss42.output.lib.dir}/jbossws-jboss42-integration.jar" manifest="${etc.dir}/default.mf"> + <jar jarfile="${jboss42.output.lib.dir}/jbossws-jboss42-integration.jar" manifest="${build.etc.dir}/default.mf"> <fileset dir="${jboss42.output.classes.dir}"> <include name="org/jboss/ws/integration/jboss42/**"/> </fileset> @@ -118,7 +118,7 @@ </war> <!-- Build jbossws42.sar --> - <jar jarfile="${jboss42.output.lib.dir}/jbossws42.sar" manifest="${etc.dir}/default.mf"> + <jar jarfile="${jboss42.output.lib.dir}/jbossws42.sar" manifest="${build.etc.dir}/default.mf"> <fileset dir="${jboss42.output.lib.dir}"> <include name="jbossws-jboss42-integration.jar"/> <include name="jbossws-context.war"/> Modified: trunk/integration-jboss50/build.xml =================================================================== --- trunk/integration-jboss50/build.xml 2007-03-12 17:10:29 UTC (rev 2602) +++ trunk/integration-jboss50/build.xml 2007-03-12 22:15:59 UTC (rev 2603) @@ -76,7 +76,7 @@ <!-- Build jbossws-jboss50-integration.jar --> <mkdir dir="${jboss50.output.lib.dir}"/> - <jar jarfile="${jboss50.output.lib.dir}/jbossws-jboss50-integration.jar" manifest="${etc.dir}/default.mf"> + <jar jarfile="${jboss50.output.lib.dir}/jbossws-jboss50-integration.jar" manifest="${build.etc.dir}/default.mf"> <fileset dir="${jboss50.output.classes.dir}"> <include name="org/jboss/ws/integration/jboss50/**"/> </fileset> @@ -95,7 +95,7 @@ </war> <!-- Build jbossws50.sar --> - <jar jarfile="${jboss50.output.lib.dir}/jbossws50.sar" manifest="${etc.dir}/default.mf"> + <jar jarfile="${jboss50.output.lib.dir}/jbossws50.sar" manifest="${build.etc.dir}/default.mf"> <fileset dir="${jboss50.output.lib.dir}"> <include name="jbossws-context.war"/> </fileset> Modified: trunk/integration-tomcat/build.xml =================================================================== --- trunk/integration-tomcat/build.xml 2007-03-12 17:10:29 UTC (rev 2602) +++ trunk/integration-tomcat/build.xml 2007-03-12 22:15:59 UTC (rev 2603) @@ -77,7 +77,7 @@ <!-- Build jbossws-tomcat-integration.jar --> <mkdir dir="${tomcat.output.lib.dir}"/> - <jar jarfile="${tomcat.output.lib.dir}/jbossws-tomcat-integration.jar" manifest="${etc.dir}/default.mf"> + <jar jarfile="${tomcat.output.lib.dir}/jbossws-tomcat-integration.jar" manifest="${build.etc.dir}/default.mf"> <fileset dir="${tomcat.output.classes.dir}"> <include name="org/jboss/ws/integration/tomcat/**"/> </fileset> @@ -127,7 +127,7 @@ <unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/stax-api.jar"/> <unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/wsdl4j.jar"/> <unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/xmlsec.jar"/> - <jar jarfile="${tomcat.output.lib.dir}/jbossws-thirdparty.jar" manifest="${etc.dir}/default.mf"> + <jar jarfile="${tomcat.output.lib.dir}/jbossws-thirdparty.jar" manifest="${build.etc.dir}/default.mf"> <fileset dir="${tomcat.output.lib.dir}/build"/> </jar> <delete dir="${tomcat.output.lib.dir}/build"/> Modified: trunk/jbossws-core/build.xml =================================================================== --- trunk/jbossws-core/build.xml 2007-03-12 17:10:29 UTC (rev 2602) +++ trunk/jbossws-core/build.xml 2007-03-12 22:15:59 UTC (rev 2603) @@ -72,8 +72,8 @@ <!-- Compile etc files (manifests and such) --> <target name="core-compile-etc" depends="core-init"> - <mkdir dir="${etc.dir}"/> - <copy todir="${etc.dir}" filtering="yes" overwrite="yes"> + <mkdir dir="${build.etc.dir}"/> + <copy todir="${build.etc.dir}" filtering="yes" overwrite="yes"> <fileset dir="${build.dir}/etc"/> <filterset> <filter token="java.vm.version" value="${java.vm.version}"/> @@ -102,7 +102,7 @@ <!-- Build jboss-jaxrpc.jar --> <mkdir dir="${core.output.lib.dir}"/> - <jar jarfile="${core.output.lib.dir}/jboss-jaxrpc.jar" manifest="${etc.dir}/default.mf"> + <jar jarfile="${core.output.lib.dir}/jboss-jaxrpc.jar" manifest="${build.etc.dir}/default.mf"> <fileset dir="${core.output.classes14.dir}"> <include name="javax/xml/rpc/**"/> </fileset> @@ -110,7 +110,7 @@ <!-- Build jboss-saaj.jar --> <mkdir dir="${core.output.lib.dir}"/> - <jar jarfile="${core.output.lib.dir}/jboss-saaj.jar" manifest="${etc.dir}/default.mf"> + <jar jarfile="${core.output.lib.dir}/jboss-saaj.jar" manifest="${build.etc.dir}/default.mf"> <fileset dir="${core.output.classes14.dir}"> <include name="javax/xml/soap/**"/> </fileset> @@ -119,7 +119,7 @@ <!-- Build jboss-jaxws.jar --> <mkdir dir="${core.output.lib.dir}"/> - <jar jarfile="${core.output.lib.dir}/jboss-jaxws.jar" manifest="${etc.dir}/default.mf"> + <jar jarfile="${core.output.lib.dir}/jboss-jaxws.jar" manifest="${build.etc.dir}/default.mf"> <fileset dir="${core.output.classes.dir}"> <include name="javax/annotation/**"/> <include name="javax/jws/**"/> @@ -130,7 +130,7 @@ <!-- Build jbossws-core.jar --> <mkdir dir="${core.output.lib.dir}"/> - <jar jarfile="${core.output.lib.dir}/jbossws-core.jar" manifest="${etc.dir}/default.mf"> + <jar jarfile="${core.output.lib.dir}/jbossws-core.jar" manifest="${build.etc.dir}/default.mf"> <fileset dir="${core.output.classes.dir}"> <include name="org/jboss/annotation/**"/> <include name="org/jboss/ws/**"/> @@ -143,14 +143,14 @@ <!-- Build jbossws-integration.jar --> <mkdir dir="${core.output.lib.dir}"/> - <jar jarfile="${core.output.lib.dir}/jbossws-integration.jar" manifest="${etc.dir}/default.mf"> + <jar jarfile="${core.output.lib.dir}/jbossws-integration.jar" manifest="${build.etc.dir}/default.mf"> <fileset dir="${core.output.classes.dir}"> <include name="org/jboss/ws/integration/**"/> </fileset> </jar> <!-- Build jbossws-client.jar --> - <jar jarfile="${core.output.lib.dir}/jbossws-client.jar" manifest="${etc.dir}/default.mf"> + <jar jarfile="${core.output.lib.dir}/jbossws-client.jar" manifest="${build.etc.dir}/default.mf"> <fileset dir="${core.output.classes.dir}"> <include name="org/jboss/ws/**"/> </fileset> @@ -162,14 +162,14 @@ <include name="schema/**"/> <include name="dtd/**"/> </fileset> - <fileset dir="${etc.dir}"> + <fileset dir="${build.etc.dir}"> <include name="wsprovide.bat"/> <include name="wsconsume.bat"/> <include name="wsrunclient.bat"/> <include name="wstools.bat"/> <include name="wstools-log4j.xml"/> </fileset> - <zipfileset dir="${etc.dir}" filemode="755"> + <zipfileset dir="${build.etc.dir}" filemode="755"> <include name="wsprovide.sh"/> <include name="wsconsume.sh"/> <include name="wsrunclient.sh"/> Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/client/ServiceRefHandlerImpl.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/core/client/ServiceRefHandlerImpl.java 2007-03-12 17:10:29 UTC (rev 2602) +++ trunk/jbossws-core/src/java/org/jboss/ws/core/client/ServiceRefHandlerImpl.java 2007-03-12 22:15:59 UTC (rev 2603) @@ -105,7 +105,7 @@ { // The service-ref-type is JAXWS specific String serviceRefType = serviceRef.getServiceRefType(); - if (serviceRefType != null) + if (serviceRefType != null || serviceRef.getAnnotatedElement() != null) return Type.JAXWS; String siName = serviceRef.getServiceInterface(); @@ -123,7 +123,7 @@ } catch (ClassNotFoundException e) { - throw new NamingException("Cannot load service-endpoint-interface: " + siName); + throw new NamingException("Cannot load <service-interface>: " + siName); } if (javax.xml.ws.Service.class.isAssignableFrom(siClass)) Modified: trunk/jbossws-tests/ant-import/build-samples-jaxrpc.xml =================================================================== --- trunk/jbossws-tests/ant-import/build-samples-jaxrpc.xml 2007-03-12 17:10:29 UTC (rev 2602) +++ trunk/jbossws-tests/ant-import/build-samples-jaxrpc.xml 2007-03-12 22:15:59 UTC (rev 2603) @@ -124,6 +124,7 @@ <fileset dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/samples/exception/*Exception.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/exception/ExceptionServiceInterface.class"/> + <include name="org/jboss/test/ws/jaxrpc/samples/exception/ExceptionService.class"/> </fileset> <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/exception/META-INF"> <include name="application-client.xml"/>