Author: thomas.diesler(a)jboss.com Date: 2007-01-05 05:37:57 -0500 (Fri, 05 Jan 2007) New Revision: 1805 Removed: trunk/integration-jboss40/src/main/resources/jbossws14.sar/ Modified: trunk/integration-jboss40/build.xml Log: Fix deploy-tomcat Add jboss-service.xml without ejb3 Modified: trunk/integration-jboss40/build.xml =================================================================== --- trunk/integration-jboss40/build.xml 2007-01-05 10:37:52 UTC (rev 1804) +++ trunk/integration-jboss40/build.xml 2007-01-05 10:37:57 UTC (rev 1805) @@ -163,8 +163,8 @@ <include name="standard-jaxws-client-config.xml"/> <include name="standard-jaxws-endpoint-config.xml"/> </metainf> - <metainf dir="${jboss40.resources.dir}/jbossws14.sar/META-INF"> - <include name="jboss-service.xml"/> + <metainf dir="${jboss42.resources.dir}/jbossws.sar/META-INF"> + <include name="jboss-service*.xml"/> </metainf> </jar> @@ -232,8 +232,8 @@ <metainf dir="${core.resources.dir}/jboss-saaj.jar/META-INF"/> </jar> - <!-- Build jbossws14.sar --> - <jar jarfile="${jboss40.output.lib.dir}/jbossws14.sar" manifest="${output.etc.dir}/default.mf"> + <!-- Build jbossws40-jdk14.sar --> + <jar jarfile="${jboss40.output.lib.dir}/jbossws40-jdk14.sar" manifest="${output.etc.dir}/default.mf"> <fileset dir="${jboss40.output.lib.dir}"> <include name="jbossws14-jboss40-integration.jar"/> <include name="jbossws-context.war"/> @@ -258,8 +258,8 @@ <include name="standard-jaxws-client-config.xml"/> <include name="standard-jaxws-endpoint-config.xml"/> </metainf> - <metainf dir="${jboss40.resources.dir}/jbossws14.sar/META-INF"> - <include name="jboss-service.xml"/> + <metainf dir="${jboss42.resources.dir}/jbossws.sar/META-INF"> + <include name="jboss-service*.xml"/> </metainf> </jar> @@ -269,7 +269,7 @@ <!-- Deployment --> <!-- ================================================================== --> - <!-- Deploy jbossws to the jboss40 --> + <!-- Deploy jbossws to jboss40 --> <target name="deploy-jboss40" depends="jboss40-jars" description="Deploy jbossws"> <copy todir="${jboss40.home}/client" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/> <copy todir="${jboss40.home}/lib" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/> @@ -296,8 +296,8 @@ <unjar dest="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="${jboss40.output.lib.dir}/jbossws40.sar"/> </target> - <!-- Deploy jbossws to the jboss40 jdk1.4 --> - <target name="deploy-jboss4014" depends="jboss40-module-jars14" description="Deploy jbossws"> + <!-- Deploy jbossws to jboss40 jdk1.4 --> + <target name="deploy-jboss40-jdk14" depends="jboss40-module-jars14" description="Deploy jbossws"> <copy todir="${jboss40.home}/client" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/> <copy todir="${jboss40.home}/lib" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/> <delete file="${jboss40.home}/client/jbossws-client.jar"/> @@ -323,7 +323,7 @@ <delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> <delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws14.sar"/> <mkdir dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws14.sar"/> - <unjar dest="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws14.sar" src="${jboss40.output.lib.dir}/jbossws14.sar"/> + <unjar dest="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws14.sar" src="${jboss40.output.lib.dir}/jbossws40-jdk14.sar"/> </target> <!-- ================================================================== -->