[jbossws-commits] JBossWS SVN: r7638 - in stack/native/branches/jbossws-native-3.0.2: modules/resources/src/main and 3 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Wed Jun 18 09:56:29 EDT 2008
Author: richard.opalka at jboss.com
Date: 2008-06-18 09:56:29 -0400 (Wed, 18 Jun 2008)
New Revision: 7638
Added:
stack/native/branches/jbossws-native-3.0.2/modules/resources/src/main/scripts/
stack/native/branches/jbossws-native-3.0.2/modules/resources/src/main/scripts/zip-other-configs.xml
Modified:
stack/native/branches/jbossws-native-3.0.2/modules/resources/pom.xml
stack/native/branches/jbossws-native-3.0.2/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
stack/native/branches/jbossws-native-3.0.2/src/main/distro/build-deploy.xml
Log:
[JBWS-2228] sync QA branch with trunk
Modified: stack/native/branches/jbossws-native-3.0.2/modules/resources/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.0.2/modules/resources/pom.xml 2008-06-18 13:19:15 UTC (rev 7637)
+++ stack/native/branches/jbossws-native-3.0.2/modules/resources/pom.xml 2008-06-18 13:56:29 UTC (rev 7638)
@@ -14,4 +14,28 @@
<relativePath>../../pom.xml</relativePath>
</parent>
+ <!-- plugins -->
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <ant antfile="src/main/scripts/zip-other-configs.xml">
+ <property name="project.build.finalName" value="${project.build.finalName}"/>
+ </ant>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Modified: stack/native/branches/jbossws-native-3.0.2/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
--- stack/native/branches/jbossws-native-3.0.2/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2008-06-18 13:19:15 UTC (rev 7637)
+++ stack/native/branches/jbossws-native-3.0.2/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2008-06-18 13:56:29 UTC (rev 7638)
@@ -138,49 +138,6 @@
</macrodef>
<!-- ================================================================== -->
- <!-- Deploy Deployers -->
- <!-- ================================================================== -->
-
- <macrodef name="macro-deploy-jbossws-deployers50">
- <attribute name="thirdpartydir"/>
- <attribute name="targetdir"/>
- <attribute name="jbossid"/>
- <sequential>
- <mkdir dir="@{targetdir}"/>
- <copy todir="@{targetdir}" flatten="true" overwrite="true">
- <fileset dir="@{thirdpartydir}">
- <include name="**/jbossws-common.jar"/>
- <include name="**/jbossws-framework.jar"/>
- <include name="**/jbossws-@{jbossid}.jar"/>
- </fileset>
- </copy>
- <copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true">
- <fileset dir="@{thirdpartydir}">
- <include name="**/jbossws-deployer-beans.xml"/>
- </fileset>
- </copy>
- </sequential>
- </macrodef>
-
- <!-- ================================================================== -->
- <!-- Deploy Deploy -->
- <!-- ================================================================== -->
-
- <macrodef name="macro-deploy-jbossws-deploy50">
- <attribute name="thirdpartydir"/>
- <attribute name="targetdir"/>
- <attribute name="jbossid"/>
- <sequential>
- <mkdir dir="@{targetdir}"/>
- <copy todir="@{targetdir}" flatten="true" overwrite="true">
- <fileset dir="@{thirdpartydir}">
- <include name="**/jbossws-@{jbossid}-container.jar"/>
- </fileset>
- </copy>
- </sequential>
- </macrodef>
-
- <!-- ================================================================== -->
<!-- Deploy Lib Endorsed -->
<!-- ================================================================== -->
@@ -260,7 +217,7 @@
<mkdir dir="@{targetdir}"/>
<unzip dest="@{targetdir}">
<fileset dir="@{thirdpartydir}">
- <include name="juddi-service.sar"/>
+ <include name="**/juddi-service.sar"/>
</fileset>
</unzip>
</sequential>
@@ -271,13 +228,14 @@
<!-- ================================================================== -->
<macrodef name="macro-deploy-jbossws-sar42">
+ <attribute name="thirdpartydir"/>
<attribute name="artifactsdir"/>
<attribute name="targetdir"/>
<attribute name="jbossid"/>
<sequential>
<mkdir dir="@{targetdir}"/>
<copy todir="@{targetdir}" flatten="true">
- <fileset dir="@{artifactsdir}">
+ <fileset dir="@{thirdpartydir}">
<patternset refid="jbossws.service.lib.patternset"/>
<include name="**/jaxb-api.jar"/>
<include name="**/jaxb-impl.jar"/>
@@ -286,7 +244,7 @@
</fileset>
</copy>
<unzip dest="@{targetdir}/jbossws-management.war">
- <fileset dir="@{artifactsdir}/lib">
+ <fileset dir="@{thirdpartydir}">
<include name="**/jbossws-native-management.war"/>
</fileset>
</unzip>
@@ -305,18 +263,19 @@
</macrodef>
<macrodef name="macro-deploy-jbossws-sar50">
+ <attribute name="thirdpartydir"/>
<attribute name="artifactsdir"/>
<attribute name="targetdir"/>
<attribute name="jbossid"/>
<sequential>
<mkdir dir="@{targetdir}"/>
<copy todir="@{targetdir}" flatten="true" overwrite="true">
- <fileset dir="@{artifactsdir}">
+ <fileset dir="@{thirdpartydir}">
<patternset refid="jbossws.service.lib.patternset"/>
</fileset>
</copy>
<unzip dest="@{targetdir}/jbossws-management.war">
- <fileset dir="@{artifactsdir}/lib">
+ <fileset dir="@{thirdpartydir}">
<include name="**/jbossws-native-management.war"/>
</fileset>
</unzip>
@@ -338,13 +297,14 @@
<!-- ================================================================== -->
<macrodef name="macro-deploy-jbossws-deployers50">
+ <attribute name="thirdpartydir"/>
<attribute name="artifactsdir"/>
<attribute name="targetdir"/>
<attribute name="jbossid"/>
<sequential>
<mkdir dir="@{targetdir}"/>
<copy todir="@{targetdir}" flatten="true" overwrite="true">
- <fileset dir="@{artifactsdir}/lib">
+ <fileset dir="@{thirdpartydir}">
<include name="**/jbossws-common.jar"/>
<include name="**/jbossws-framework.jar"/>
<include name="**/jbossws-@{jbossid}.jar"/>
@@ -367,13 +327,19 @@
<attribute name="targetdir"/>
<attribute name="jbossid"/>
<sequential>
- <mkdir dir="@{targetdir}"/>
- <unzip dest="@{targetdir}/jbossws.sar" src="@{thirdpartydir}/jbossws-@{jbossid}-container.jar">
+ <copy todir="@{targetdir}" flatten="true" overwrite="true">
+ <fileset dir="@{thirdpartydir}">
+ <include name="**/jbossws-@{jbossid}-container.jar"/>
+ </fileset>
+ </copy>
+ <unzip dest="@{targetdir}" src="@{targetdir}/jbossws-@{jbossid}-container.jar">
<patternset>
<include name="META-INF/jbossws-container-beans.xml"/>
</patternset>
</unzip>
- <move file="@{targetdir}/jbossws.sar/META-INF/jbossws-container-beans.xml" todir="@{targetdir}"/>
+ <move file="@{targetdir}/META-INF/jbossws-container-beans.xml" tofile="@{targetdir}/jbossws-container-beans.xml"/>
+ <delete file="@{targetdir}/jbossws-@{jbossid}-container.jar"/>
+ <delete dir="@{targetdir}/META-INF"/>
</sequential>
</macrodef>
@@ -384,30 +350,36 @@
<!-- JDK Detection -->
<available classname="java.io.Console" property="HAVE_JDK_1.6"/>
- <target name="deploy-jbossws-native42" depends="deploy-jbossws-endorsed">
+ <target name="deploy-jbossws-native42" depends="check-parameters,deploy-jbossws-endorsed">
<macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/>
- <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${artifactsdir}/lib" jbossid="${jbossid}"/>
- <macro-deploy-jbossws-lib42 targetdir="${installserver}/../../lib" thirdpartydir="${artifactsdir}/lib"/>
- <macro-deploy-jbossws-server-lib42 targetdir="${installserver}/lib" thirdpartydir="${artifactsdir}/lib" jbossid="${jbossid}"/>
- <macro-deploy-jbossws-sar42 targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" jbossid="${jbossid}"/>
- <macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${artifactsdir}/lib"/>
+ <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
+ <macro-deploy-jbossws-lib42 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/>
+ <macro-deploy-jbossws-server-lib42 targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
+ <macro-deploy-jbossws-sar42 targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
+ <macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/>
</target>
- <target name="deploy-jbossws-native50" depends="deploy-jbossws-endorsed">
+ <target name="deploy-jbossws-native50" depends="check-parameters,deploy-jbossws-endorsed">
<macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/>
- <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${artifactsdir}/lib" jbossid="${jbossid}"/>
- <macro-deploy-jbossws-lib50 targetdir="${installserver}/../../lib" thirdpartydir="${artifactsdir}/lib"/>
- <macro-deploy-jbossws-server-lib50 targetdir="${installserver}/lib" thirdpartydir="${artifactsdir}/lib" jbossid="${jbossid}"/>
- <macro-deploy-jbossws-sar50 targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" jbossid="${jbossid}"/>
- <macro-deploy-jbossws-deployers50 targetdir="${installserver}/deployers/jbossws.deployer/" artifactsdir="${artifactsdir}" jbossid="${jbossid}"/>
- <macro-deploy-jbossws-deploy50 targetdir="${installserver}/deploy" thirdpartydir="${artifactsdir}/lib" jbossid="${jbossid}"/>
- <macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${artifactsdir}/lib"/>
+ <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
+ <macro-deploy-jbossws-lib50 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/>
+ <macro-deploy-jbossws-server-lib50 targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
+ <macro-deploy-jbossws-sar50 targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
+ <macro-deploy-jbossws-deployers50 targetdir="${installserver}/deployers/jbossws.deployer/" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
+ <macro-deploy-jbossws-deploy50 targetdir="${installserver}/deploy" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
+ <macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/>
</target>
<target name="deploy-jbossws-endorsed" if="HAVE_JDK_1.6">
- <macro-deploy-jbossws-endorsed targetdir="${installserver}/../../lib/endorsed" thirdpartydir="${artifactsdir}/lib"/>
+ <macro-deploy-jbossws-endorsed targetdir="${installserver}/../../lib/endorsed" thirdpartydir="${thirdpartydir}"/>
</target>
+ <target name="check-parameters">
+ <fail message="artifactsdir must be specified" unless="artifactsdir"/>
+ <fail message="thirdpartydir must be specified" unless="thirdpartydir"/>
+ <fail message="installserver must be specified" unless="installserver"/>
+ </target>
+
<!-- ================================================================== -->
<!-- Undeploy JBossWS -->
<!-- ================================================================== -->
@@ -448,4 +420,4 @@
</sequential>
</macrodef>
-</project>
\ No newline at end of file
+</project>
Added: stack/native/branches/jbossws-native-3.0.2/modules/resources/src/main/scripts/zip-other-configs.xml
===================================================================
--- stack/native/branches/jbossws-native-3.0.2/modules/resources/src/main/scripts/zip-other-configs.xml (rev 0)
+++ stack/native/branches/jbossws-native-3.0.2/modules/resources/src/main/scripts/zip-other-configs.xml 2008-06-18 13:56:29 UTC (rev 7638)
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- -->
+<!-- ====================================================================== -->
+
+<!-- $Id$ -->
+
+<project default="main">
+
+ <property name="target.dir" value="${basedir}/target"/>
+ <property name="source.jar" value="${target.dir}/${project.build.finalName}-sources.jar"/>
+ <property name="binary.jar" value="${target.dir}/${project.build.finalName}.jar"/>
+
+ <target name="main">
+ <copy todir="${target.dir}/classes/resources">
+ <fileset dir="${basedir}/../core/target/resources"/>
+ <fileset dir="${basedir}/../client/src/main/resources/META-INF"/>
+ </copy>
+ <jar destfile="${source.jar}" basedir="${target.dir}/classes" update="true"/>
+ <jar destfile="${binary.jar}" basedir="${target.dir}/classes" update="true"/>
+ </target>
+
+</project>
Property changes on: stack/native/branches/jbossws-native-3.0.2/modules/resources/src/main/scripts/zip-other-configs.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: stack/native/branches/jbossws-native-3.0.2/src/main/distro/build-deploy.xml
===================================================================
--- stack/native/branches/jbossws-native-3.0.2/src/main/distro/build-deploy.xml 2008-06-18 13:19:15 UTC (rev 7637)
+++ stack/native/branches/jbossws-native-3.0.2/src/main/distro/build-deploy.xml 2008-06-18 13:56:29 UTC (rev 7638)
@@ -23,6 +23,7 @@
<param name="installserver" value="${deploy.structure}/server/${jboss.server.instance}"/>
<param name="jbossid" value="${jbossws.integration.target}"/>
<param name="artifactsdir" value="${deploy.artifacts.dir}"/>
+ <param name="thirdpartydir" value="${deploy.artifacts.dir}"/>
</antcall>
<macro-create-deploy-conf deploystructure="${deploy.structure}"/>
</target>
@@ -116,6 +117,7 @@
<param name="installserver" value="${deploy.structure}/server/${jboss.server.instance}"/>
<param name="jbossid" value="${jbossws.integration.target}"/>
<param name="artifactsdir" value="${deploy.artifacts.dir}"/>
+ <param name="thirdpartydir" value="${deploy.artifacts.dir}"/>
</antcall>
<macro-create-deploy-conf deploystructure="${deploy.structure}"/>
</target>
@@ -142,7 +144,7 @@
<macro-undeploy-jbossws targetdir="${jboss500.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
<!-- [JBWS-2177] Test clients fail with xml-apis.jar in lib/endorsed -->
<delete file="${jboss500.home}/lib/endorsed/xml-apis.jar"/>
- <!-- wsconsume will fail with a LinkageError too -->
+ <!-- wsconsume will fail with a LinkageError too -->
<delete file="${jboss500.home}/lib/endorsed/jaxb-api.jar"/>
</target>
More information about the jbossws-commits
mailing list