April 2008 - jbossws-commits - Jboss List Archives

JBossWS SVN: r6666 - container/jboss42/branches/jbossws-jboss423.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-04-24 11:23:17 -0400 (Thu, 24 Apr 2008) New Revision: 6666 Modified: container/jboss42/branches/jbossws-jboss423/pom.xml Log: docu Modified: container/jboss42/branches/jbossws-jboss423/pom.xml =================================================================== --- container/jboss42/branches/jbossws-jboss423/pom.xml 2008-04-24 15:09:16 UTC (rev 6665) +++ container/jboss42/branches/jbossws-jboss423/pom.xml 2008-04-24 15:23:17 UTC (rev 6666) @@ -18,14 +18,10 @@  <properties>  <jboss.version>4.2.3-SNAPSHOT</jboss.version> <jbossws.common.version>3.0.0-SNAPSHOT</jbossws.common.version>

18 years

1
0
0 / 0

JBossWS SVN: r6665 - in stack/cxf/trunk: modules/server and 4 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-04-24 11:09:16 -0400 (Thu, 24 Apr 2008) New Revision: 6665 Modified: stack/cxf/trunk/.classpath stack/cxf/trunk/ant.properties.example stack/cxf/trunk/build.xml stack/cxf/trunk/modules/server/pom.xml stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml stack/cxf/trunk/modules/testsuite/pom.xml stack/cxf/trunk/pom.xml stack/cxf/trunk/src/main/distro/build-deploy.xml stack/cxf/trunk/src/main/distro/build-setup.xml stack/cxf/trunk/src/main/distro/build.xml stack/cxf/trunk/src/main/distro/jbossws-deploy-macros.xml stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml Log: jboss422 ok Modified: stack/cxf/trunk/.classpath =================================================================== --- stack/cxf/trunk/.classpath 2008-04-24 14:40:48 UTC (rev 6664) +++ stack/cxf/trunk/.classpath 2008-04-24 15:09:16 UTC (rev 6665) @@ -1,8 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="modules/server/src/main/java"/> - <classpathentry kind="src" path="modules/testsuite/framework-tests/src/test/java"/> - <classpathentry kind="src" path="modules/testsuite/cxf-tests/src/test/java"/> <classpathentry kind="src" path="modules/client/src/main/java"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> Modified: stack/cxf/trunk/ant.properties.example =================================================================== --- stack/cxf/trunk/ant.properties.example 2008-04-24 14:40:48 UTC (rev 6664) +++ stack/cxf/trunk/ant.properties.example 2008-04-24 15:09:16 UTC (rev 6665) @@ -9,9 +9,6 @@ #jboss500.home=/home/tdiesler/svn/jbossas/tags/JBoss_5_0_0_Beta4/build/output/jboss-5.0.0.Beta4 #jboss501.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.CR1 -# The JBoss server under test. This can be [jboss422|jboss423|jboss500|jboss501] -jbossws.integration.target=jboss422 - # The JBoss settings jboss.server.instance=default Modified: stack/cxf/trunk/build.xml =================================================================== --- stack/cxf/trunk/build.xml 2008-04-24 14:40:48 UTC (rev 6664) +++ stack/cxf/trunk/build.xml 2008-04-24 15:09:16 UTC (rev 6665) @@ -13,11 +13,6 @@ <project basedir="." name="JBossWS-CXF"> -  - <available property="ant.properties.available" file="${basedir}/ant.properties"/> - <fail message="Cannot find ant.properties. Did you copy/edit ant.properties.example?" unless="ant.properties.available"/> - <property file="${basedir}/ant.properties"/> -    @@ -31,8 +26,6 @@ <property name="stack.server.dir" value="${stack.modules.dir}/server"/> <property name="deploy.artifacts.dir" value="${stack.output.dir}/deploy-artifacts"/> - <property name="deploy.structure.jboss42" value="${stack.output.dir}/deploy-jboss422"/> - <property name="deploy.structure.jboss50" value="${stack.output.dir}/deploy-jboss500"/> <import file="${stack.distro.dir}/build-setup.xml"/> <import file="${stack.distro.dir}/build-deploy.xml"/> @@ -81,7 +74,7 @@ </exec> </target> - <target name="clean" depends="prepare" description="Cleans up most generated files."> + <target name="clean" description="Cleans up most generated files."> <echo message="*************************************"/> <echo message="* mvn clean *"/> Modified: stack/cxf/trunk/modules/server/pom.xml =================================================================== --- stack/cxf/trunk/modules/server/pom.xml 2008-04-24 14:40:48 UTC (rev 6664) +++ stack/cxf/trunk/modules/server/pom.xml 2008-04-24 15:09:16 UTC (rev 6665) @@ -37,10 +37,18 @@ </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss42</artifactId> + <artifactId>jbossws-jboss422</artifactId> + <version>${jbossws.jboss422.version}</version> <classifier>resources</classifier> <type>zip</type> </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss423</artifactId> + <version>${jbossws.jboss423.version}</version> + <classifier>resources</classifier> + <type>zip</type> + </dependency>  <dependency> @@ -129,17 +137,25 @@ <goal>unpack</goal> </goals> <configuration> - <artifactItems>org.jboss.ws:jbossws-jboss42:zip:resources</artifactItems> - <artifactItems> - <artifactItem> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss42</artifactId> - <version>${jbossws.jboss42.version}</version> - <classifier>resources</classifier> - <type>zip</type> - <outputDirectory>${project.build.directory}/resources</outputDirectory> - </artifactItem> - </artifactItems> + <artifactItems>org.jboss.ws:jbossws-jboss*:zip:resources</artifactItems> + <artifactItems> + <artifactItem> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss422</artifactId> + <version>${jbossws.jboss422.version}</version> + <classifier>resources</classifier> + <type>zip</type> + <outputDirectory>${project.build.directory}/resources/jbossws-jboss422</outputDirectory> + </artifactItem> + <artifactItem> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss423</artifactId> + <version>${jbossws.jboss423.version}</version> + <classifier>resources</classifier> + <type>zip</type> + <outputDirectory>${project.build.directory}/resources/jbossws-jboss423</outputDirectory> + </artifactItem> + </artifactItems> </configuration> </execution> </executions> @@ -155,6 +171,8 @@ </goals> <configuration> <tasks> + <property name="jbossws.jboss422.version" value="${jbossws.jboss422.version}"/> + <property name="jbossws.jboss423.version" value="${jbossws.jboss423.version}"/> <ant antfile="src/main/scripts/antrun-beans-config.xml"/> </tasks> </configuration> Modified: stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml =================================================================== --- stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2008-04-24 14:40:48 UTC (rev 6664) +++ stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2008-04-24 15:09:16 UTC (rev 6665) @@ -29,28 +29,40 @@  <target name="main" depends="init"> -  - <echo message="Concat jbossws-cxf50-beans.xml"/> - <concat destfile="${project.build.resources.directory}/jbossws-beans50/META-INF/jboss-beans.xml"> +  + <echo message="Concat jbossws-jboss422/jbossws.beans"/> + <concat destfile="${project.build.resources.directory}/jbossws-jboss422/jbossws.beans/META-INF/jboss-beans.xml"> <header trimleading="yes"> - <deployment xmlns="urn:jboss:bean-deployer:2.0"> </header> + <deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd" + xmlns="urn:jboss:bean-deployer"> </header> <fileset file="${project.resources.directory}/jbossws-cxf-config.xml"/> + <fileset file="${project.build.resources.directory}/jbossws-jboss422/jbossws-jboss42-config.xml"/> <footer trimleading="yes"> </deployment> </footer> </concat> -  - <echo message="Concat jbossws-cxf42-beans.xml"/> - <concat destfile="${project.build.resources.directory}/jbossws-beans42/META-INF/jboss-beans.xml"> +  + <echo message="Concat jbossws-jboss423/jbossws.beans"/> + <concat destfile="${project.build.resources.directory}/jbossws-jboss423/jbossws.beans/META-INF/jboss-beans.xml"> <header trimleading="yes"> <deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd" xmlns="urn:jboss:bean-deployer"> </header> <fileset file="${project.resources.directory}/jbossws-cxf-config.xml"/> - <fileset file="${project.build.resources.directory}/jbossws-jboss42-config.xml"/> + <fileset file="${project.build.resources.directory}/jbossws-jboss423/jbossws-jboss42-config.xml"/> <footer trimleading="yes"> </deployment> </footer> </concat> +  + </target> </project> Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2008-04-24 14:40:48 UTC (rev 6664) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2008-04-24 15:09:16 UTC (rev 6665) @@ -163,7 +163,7 @@ </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss42</artifactId> + <artifactId>jbossws-jboss422</artifactId> </dependency> </dependencies> <build> @@ -178,7 +178,41 @@ </build> </profile> +  + <profile> + <id>jboss423</id> + <properties> + <jboss.version>4.2.3.GA</jboss.version> + <jbossws.integration.target>jboss423</jbossws.integration.target> + </properties> + <dependencies> + <dependency> + <groupId>org.jboss.client</groupId> + <artifactId>jbossall-client</artifactId> + <version>${jboss.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss423</artifactId> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <argLine>-Djava.endorsed.dirs=${jboss423.home}/lib/endorsed</argLine> + </configuration> + </plugin> + </plugins> + </build> + </profile> + +  <dependency> @@ -294,8 +307,24 @@ </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss42</artifactId> + <artifactId>jbossws-jboss422</artifactId> </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss422</artifactId> + <classifier>resources</classifier> + <type>zip</type> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss423</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss423</artifactId> + <classifier>resources</classifier> + <type>zip</type> + </dependency> </dependencies>  Modified: stack/cxf/trunk/src/main/distro/build-deploy.xml =================================================================== --- stack/cxf/trunk/src/main/distro/build-deploy.xml 2008-04-24 14:40:48 UTC (rev 6664) +++ stack/cxf/trunk/src/main/distro/build-deploy.xml 2008-04-24 15:09:16 UTC (rev 6665) @@ -18,61 +18,88 @@  <target name="deploy-structure-jboss42" depends="prepare-deploy"> - <delete dir="${deploy.structure.jboss42}"/> + <delete dir="${deploy.structure}"/> <antcall target="deploy-jbossws-cxf42" inheritall="false"> - <param name="installserver" value="${deploy.structure.jboss42}/server/${jboss.server.instance}"/> + <param name="installserver" value="${deploy.structure}/server/${jboss.server.instance}"/> + <param name="jbossid" value="${jbossws.integration.target}"/> <param name="artifactsdir" value="${deploy.artifacts.dir}"/> </antcall> - <macro-create-deploy-conf deploystructure="${deploy.structure.jboss42}"/> + <macro-create-deploy-conf deploystructure="${deploy.structure}"/> </target>    + <target name="target-jboss422"> + <property name="jbossws.integration.target" value="jboss422"/> + </target> + <target name="deploy-jboss422" depends="undeploy-jboss422,deploy-structure-jboss42" description="Deploy jbossws to jboss422"> <fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/> <copy todir="${jboss422.home}" overwrite="true"> - <fileset dir="${deploy.structure.jboss42}"/> + <fileset dir="${deploy.structure}"/> </copy> <chmod dir="${jboss422.home}/bin" perm="+x" includes="*.sh"/> </target> - <target name="undeploy-jboss422" depends="prepare" description="Remove jbossws from jboss422"> + <target name="undeploy-jboss422" depends="target-jboss422, prepare" description="Remove jbossws from jboss422"> <fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/> <macro-undeploy-jbossws targetdir="${jboss422.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/> </target> - +    - <target name="deploy-jboss423" depends="undeploy-jboss423" description="Deploy jbossws to jboss423"> + <target name="target-jboss423"> + <property name="jbossws.integration.target" value="jboss423"/> + </target> + + <target name="deploy-jboss423" depends="undeploy-jboss423,deploy-structure-jboss42" description="Deploy jbossws to jboss423"> <fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/> <copy todir="${jboss423.home}" overwrite="true"> - <fileset dir="${deploy.structure.jboss42}"/> + <fileset dir="${deploy.structure}"/> </copy> <chmod dir="${jboss423.home}/bin" perm="+x" includes="*.sh"/> </target> - <target name="undeploy-jboss423" depends="prepare" description="Remove jbossws from jboss423"> + <target name="undeploy-jboss423" depends="target-jboss423, prepare" description="Remove jbossws from jboss423"> <fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/> <macro-undeploy-jbossws targetdir="${jboss423.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/> </target>  +  +  + + <target name="deploy-structure-jboss50" depends="prepare-deploy"> + <delete dir="${deploy.structure}"/> + <antcall target="deploy-jbossws-cxf50" inheritall="false"> + <param name="installserver" value="${deploy.structure}/server/${jboss.server.instance}"/> + <param name="jbossid" value="${jbossws.integration.target}"/> + <param name="artifactsdir" value="${deploy.artifacts.dir}"/> + </antcall> + <macro-create-deploy-conf deploystructure="${deploy.structure}"/> + </target> + +    - <target name="deploy-jboss500" depends="undeploy-jboss500" description="Deploy jbossws to jboss500"> + <target name="target-jboss500"> + <property name="jbossws.integration.target" value="jboss500"/> + </target> + + <target name="deploy-jboss500" depends="undeploy-jboss500,deploy-structure-jboss50" description="Deploy jbossws to jboss500"> <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/> <copy todir="${jboss500.home}" overwrite="true"> - <fileset dir="${deploy.structure.jboss50}"/> + <fileset dir="${deploy.structure}"/> </copy> <chmod dir="${jboss500.home}/bin" perm="+x" includes="*.sh"/> </target> - <target name="undeploy-jboss500" depends="prepare" description="Remove jbossws from jboss500"> + <target name="undeploy-jboss500" depends="target-jboss500, prepare" description="Remove jbossws from jboss500"> <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/> <macro-undeploy-jbossws targetdir="${jboss500.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/> </target> @@ -81,15 +108,19 @@   - <target name="deploy-jboss501" depends="undeploy-jboss501" description="Deploy jbossws to jboss501"> + <target name="target-jboss501"> + <property name="jbossws.integration.target" value="jboss501"/> + </target> + + <target name="deploy-jboss501" depends="undeploy-jboss501,deploy-structure-jboss50" description="Deploy jbossws to jboss501"> <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/> <copy todir="${jboss501.home}" overwrite="true"> - <fileset dir="${deploy.structure.jboss50}"/> + <fileset dir="${deploy.structure}"/> </copy> <chmod dir="${jboss501.home}/bin" perm="+x" includes="*.sh"/> </target> - <target name="undeploy-jboss501" depends="prepare" description="Remove jbossws from jboss501"> + <target name="undeploy-jboss501" depends="target-jboss501, prepare" description="Remove jbossws from jboss501"> <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/> <macro-undeploy-jbossws targetdir="${jboss501.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/> </target> Modified: stack/cxf/trunk/src/main/distro/build-setup.xml =================================================================== --- stack/cxf/trunk/src/main/distro/build-setup.xml 2008-04-24 14:40:48 UTC (rev 6664) +++ stack/cxf/trunk/src/main/distro/build-setup.xml 2008-04-24 15:09:16 UTC (rev 6665) @@ -20,7 +20,6 @@  <available property="ant.properties.available" file="${basedir}/ant.properties"/> <fail message="Cannot find ant.properties. Did you copy/edit ant.properties.example?" unless="ant.properties.available"/> - <property file="${basedir}/ant.properties"/> <property name="jboss422.lib" value="${jboss422.home}/lib"/> @@ -59,24 +58,29 @@ <available property="jboss500.available" file="${jboss500.available.file}"/> <available property="jboss501.available" file="${jboss501.available.file}"/> - <condition property="jbossws.integration.jboss42" value="true"> - <or> - <equals arg1="${jbossws.integration.target}" arg2="jboss422"/> - <equals arg1="${jbossws.integration.target}" arg2="jboss423"/> - </or> - </condition> - <condition property="jbossws.integration.jboss50" value="true"> - <or> - <equals arg1="${jbossws.integration.target}" arg2="jboss500"/> - <equals arg1="${jbossws.integration.target}" arg2="jboss501"/> - </or> - </condition> -    <target name="prepare"> + + <fail message="jbossws.integration.target not set" unless="jbossws.integration.target"/> + + <condition property="jbossws.integration.jboss42" value="true"> + <or> + <equals arg1="${jbossws.integration.target}" arg2="jboss422"/> + <equals arg1="${jbossws.integration.target}" arg2="jboss423"/> + </or> + </condition> + <condition property="jbossws.integration.jboss50" value="true"> + <or> + <equals arg1="${jbossws.integration.target}" arg2="jboss500"/> + <equals arg1="${jbossws.integration.target}" arg2="jboss501"/> + </or> + </condition> + + <property name="deploy.structure" value="${stack.output.dir}/deploy-${jbossws.integration.target}"/> + <tstamp> <format property="build.id" pattern="yyyyMMddHHmm"/> </tstamp> Modified: stack/cxf/trunk/src/main/distro/build.xml =================================================================== --- stack/cxf/trunk/src/main/distro/build.xml 2008-04-24 14:40:48 UTC (rev 6664) +++ stack/cxf/trunk/src/main/distro/build.xml 2008-04-24 15:09:16 UTC (rev 6665) @@ -29,8 +29,6 @@ <property name="tests.output.dir" value="${basedir}/output"/> <property name="deploy.artifacts.dir" value="${basedir}/deploy"/> - <property name="deploy.structure.jboss42" value="${basedir}/output/deploy-jboss422"/> - <property name="deploy.structure.jboss50" value="${basedir}/output/deploy-jboss500"/> <property name="jbossws.default.deploy.conf" value="${build.dir}/jbossws-default-deploy.conf"/> <import file="${build.dir}/build-setup.xml"/> Modified: stack/cxf/trunk/src/main/distro/jbossws-deploy-macros.xml =================================================================== --- stack/cxf/trunk/src/main/distro/jbossws-deploy-macros.xml 2008-04-24 14:40:48 UTC (rev 6664) +++ stack/cxf/trunk/src/main/distro/jbossws-deploy-macros.xml 2008-04-24 15:09:16 UTC (rev 6665) @@ -179,12 +179,13 @@ <macrodef name="macro-deploy-jbossws-server-lib"> <attribute name="thirdpartydir"/> <attribute name="targetdir"/> + <attribute name="jbossid"/> <sequential> <mkdir dir="@{targetdir}"/> <copy todir="@{targetdir}" flatten="true" overwrite="true"> <fileset dir="@{thirdpartydir}"> <patternset refid="jbossws.server.lib.patternset"/> - <include name="**/jbossws-jboss42.jar"/> + <include name="**/jbossws-(a){jbossid}.jar"/> </fileset> </copy> </sequential> @@ -197,6 +198,7 @@ <macrodef name="macro-deploy-jbossws-cxf42-sar"> <attribute name="artifactsdir"/> <attribute name="targetdir"/> + <attribute name="jbossid"/> <sequential> <mkdir dir="@{targetdir}"/> <copy todir="@{targetdir}" flatten="true"> @@ -214,7 +216,7 @@ </fileset> </unzip> <copy todir="@{targetdir}/jbossws.beans"> - <fileset dir="@{artifactsdir}/resources/jbossws-beans42"> + <fileset dir="@{artifactsdir}/resources/jbossws-(a){jbossid}/jbossws.beans"> <include name="META-INF/**"/> </fileset> </copy> @@ -222,7 +224,7 @@ <fileset dir="@{artifactsdir}/resources/jbossws-cxf.sar/META-INF"/> </copy> <copy todir="@{targetdir}/META-INF"> - <fileset dir="@{artifactsdir}/resources/jbossws-jboss42.sar/META-INF"/> + <fileset dir="@{artifactsdir}/resources/jbossws-(a){jbossid}/jbossws-jboss42.sar/META-INF"/> </copy> </sequential> </macrodef> @@ -266,16 +268,16 @@ <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/> <macro-deploy-jbossws-lib42 targetdir="${installserver}/../../lib" thirdpartydir="${artifactsdir}/lib"/> <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${artifactsdir}/lib"/> - <macro-deploy-jbossws-server-lib targetdir="${installserver}/lib" thirdpartydir="${artifactsdir}/lib"/> - <macro-deploy-jbossws-cxf42-sar targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}"/> + <macro-deploy-jbossws-server-lib targetdir="${installserver}/lib" thirdpartydir="${artifactsdir}/lib" jbossid="${jbossid}"/> + <macro-deploy-jbossws-cxf42-sar targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" jbossid="${jbossid}"/> </target> <target name="deploy-jbossws-cxf50" depends="deploy-jbossws-endorsed"> <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" thirdpartydir="${thirdpartydir}"/> <macro-deploy-jbossws-lib50 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/> <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}"/> - <macro-deploy-jbossws-server-lib targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}"/> - <macro-deploy-jbossws-cxf50-sar targetdir="${installserver}/deploy/jbossws.sar" thirdpartydir="${thirdpartydir}"/> + <macro-deploy-jbossws-server-lib targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> + <macro-deploy-jbossws-cxf50-sar targetdir="${installserver}/deploy/jbossws.sar" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> </target> <target name="deploy-jbossws-endorsed" if="HAVE_JDK_1.6"> Modified: stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-04-24 14:40:48 UTC (rev 6664) +++ stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-04-24 15:09:16 UTC (rev 6665) @@ -26,7 +26,8 @@ <useStrictFiltering>true</useStrictFiltering> <unpack>false</unpack> <includes> - <include>*:jbossws-jboss42:jar</include> + <include>*:jbossws-jboss422:jar:*</include> + <include>*:jbossws-jboss423:jar:*</include> </includes> </dependencySet> </dependencySets> @@ -99,9 +100,7 @@ <directory>modules/server/target/resources</directory> <outputDirectory>resources</outputDirectory> <includes> - <include>jbossws-beans42/**</include> - <include>jbossws-cxf.sar/**</include> - <include>jbossws-jboss42.sar/**</include> + <include>jbossws-*/**</include> </includes> </fileSet> </fileSets>

18 years

1
0
0 / 0

JBossWS SVN: r6663 - container/jboss42/branches/jbossws-jboss422.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-04-24 10:02:26 -0400 (Thu, 24 Apr 2008) New Revision: 6663 Removed: container/jboss42/branches/jbossws-jboss422/profiles-example.xml Modified: container/jboss42/branches/jbossws-jboss422/pom.xml Log: 3.0.0-SNAPSHOT Modified: container/jboss42/branches/jbossws-jboss422/pom.xml =================================================================== --- container/jboss42/branches/jbossws-jboss422/pom.xml 2008-04-24 14:02:21 UTC (rev 6662) +++ container/jboss42/branches/jbossws-jboss422/pom.xml 2008-04-24 14:02:26 UTC (rev 6663) @@ -6,7 +6,7 @@ <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss422</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version>  <parent> Deleted: container/jboss42/branches/jbossws-jboss422/profiles-example.xml =================================================================== --- container/jboss42/branches/jbossws-jboss422/profiles-example.xml 2008-04-24 14:02:21 UTC (rev 6662) +++ container/jboss42/branches/jbossws-jboss422/profiles-example.xml 2008-04-24 14:02:26 UTC (rev 6663) @@ -1,18 +0,0 @@ -<profilesXml xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/profiles-1.0.0.xsd"> - -  - <profiles> - <profile> - <id>user-profile</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <properties> -  - <jboss.local.repository>/home/tdiesler/svn/jboss.local.repository</jboss.local.repository> - </properties> - </profile> - </profiles> - -</profilesXml> \ No newline at end of file

18 years

1
0
0 / 0

JBossWS SVN: r6662 - container/jboss42/branches/jbossws-jboss423.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-04-24 10:02:21 -0400 (Thu, 24 Apr 2008) New Revision: 6662 Modified: container/jboss42/branches/jbossws-jboss423/pom.xml Log: 3.0.0-SNAPSHOT Modified: container/jboss42/branches/jbossws-jboss423/pom.xml =================================================================== --- container/jboss42/branches/jbossws-jboss423/pom.xml 2008-04-24 13:50:32 UTC (rev 6661) +++ container/jboss42/branches/jbossws-jboss423/pom.xml 2008-04-24 14:02:21 UTC (rev 6662) @@ -6,7 +6,7 @@ <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss423</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version>  <parent>

18 years

1
0
0 / 0

JBossWS SVN: r6661 - in container/jboss42/branches/jbossws-jboss423: src/main/etc and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-04-24 09:50:32 -0400 (Thu, 24 Apr 2008) New Revision: 6661 Modified: container/jboss42/branches/jbossws-jboss423/pom.xml container/jboss42/branches/jbossws-jboss423/src/main/etc/component-info.xml container/jboss42/branches/jbossws-jboss423/src/main/scripts/antrun-install.xml Log: jbossws-jboss423 Modified: container/jboss42/branches/jbossws-jboss423/pom.xml =================================================================== --- container/jboss42/branches/jbossws-jboss423/pom.xml 2008-04-24 13:50:11 UTC (rev 6660) +++ container/jboss42/branches/jbossws-jboss423/pom.xml 2008-04-24 13:50:32 UTC (rev 6661) @@ -4,9 +4,9 @@ <name>JBoss Web Services - Container JBoss-4.2.3</name> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss</artifactId> + <artifactId>jbossws-jboss423</artifactId> - <version>4.2.3-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version>  <parent> @@ -200,6 +200,7 @@ <configuration> <tasks> <property name="version.id" value="${project.version}"/> + <property name="artifact.id" value="${project.artifactId}"/> <property name="jboss.local.repository" value="${jboss.local.repository}"/> <ant antfile="src/main/scripts/antrun-install.xml" target="install"/> </tasks> Modified: container/jboss42/branches/jbossws-jboss423/src/main/etc/component-info.xml =================================================================== --- container/jboss42/branches/jbossws-jboss423/src/main/etc/component-info.xml 2008-04-24 13:50:11 UTC (rev 6660) +++ container/jboss42/branches/jbossws-jboss423/src/main/etc/component-info.xml 2008-04-24 13:50:32 UTC (rev 6661) @@ -1,13 +1,13 @@ -<project name="jboss/jbossws-jboss42"> +<project name="jboss/jbossws-jboss423"> - <component id="jboss/jbossws-jboss42" + <component id="jboss/jbossws-jboss423" description="JBossWS container integration layer" version="@repository.id@" licenseType="lgpl"> - <artifact id="jbossws-jboss42.jar"/> - <artifact id="jbossws-jboss42-deployer.zip"/> - <artifact id="jbossws-jboss42-src.zip"/> + <artifact id="jbossws-jboss423.jar"/> + <artifact id="jbossws-jboss423-src.jar"/> + <artifact id="jbossws-jboss423-resources.zip"/> <import componentref="jboss/jbossws-common"> <compatible version="@jbossws-common@"/> @@ -20,7 +20,7 @@ </import> <export> - <include input="jbossws-jboss42.jar"/> + <include input="jbossws-jboss423.jar"/> </export> </component> Modified: container/jboss42/branches/jbossws-jboss423/src/main/scripts/antrun-install.xml =================================================================== --- container/jboss42/branches/jbossws-jboss423/src/main/scripts/antrun-install.xml 2008-04-24 13:50:11 UTC (rev 6660) +++ container/jboss42/branches/jbossws-jboss423/src/main/scripts/antrun-install.xml 2008-04-24 13:50:32 UTC (rev 6661) @@ -46,15 +46,15 @@ <target name="install" depends="check-properties" description="Install to jboss.local.repository">  - <available property="jbossws.jboss.jar.available" file="${project.target.dir}/jbossws-jboss-${version.id}.jar"/> - <fail message="Cannot find jbossws-jboss-${version.id}.jar. Did you run 'mvn package'?" unless="jbossws.jboss.jar.available"/> + <available property="jar.available" file="${project.target.dir}/${artifact.id}-${version.id}.jar"/> + <fail message="Cannot find ${artifact.id}-${version.id}.jar. Did you run 'mvn package'?" unless="jar.available"/>  - <property name="jboss.repository.dir" value="${jboss.local.repository}/jboss/jbossws-jboss42/${repository.id}"/> + <property name="jboss.repository.dir" value="${jboss.local.repository}/jboss/${artifact.id}/${repository.id}"/> <mkdir dir="${jboss.repository.dir}/lib"/> - <copy file="${project.target.dir}/jbossws-jboss-${version.id}.jar" tofile="${jboss.repository.dir}/lib/jbossws-jboss42.jar" overwrite="true"/> - <copy file="${project.target.dir}/jbossws-jboss-${version.id}-sources.jar" tofile="${jboss.repository.dir}/lib/jbossws-jboss42-src.jar" overwrite="true"/> - <copy file="${project.target.dir}/jbossws-jboss-${version.id}-resources.zip" tofile="${jboss.repository.dir}/lib/jbossws-jboss42-resources.zip" overwrite="true"/> + <copy file="${project.target.dir}/${artifact.id}-${version.id}.jar" tofile="${jboss.repository.dir}/lib/${artifact.id}.jar" overwrite="true"/> + <copy file="${project.target.dir}/${artifact.id}-${version.id}-sources.jar" tofile="${jboss.repository.dir}/lib/${artifact.id}-src.jar" overwrite="true"/> + <copy file="${project.target.dir}/${artifact.id}-${version.id}-resources.zip" tofile="${jboss.repository.dir}/lib/${artifact.id}-resources.zip" overwrite="true"/> <copy file="${project.target.dir}/etc/component-info.xml" tofile="${jboss.repository.dir}/component-info.xml" overwrite="true"/> </target>

18 years

1
0
0 / 0

JBossWS SVN: r6660 - container/jboss42/branches/jbossws-jboss422/src/main/scripts.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-04-24 09:50:11 -0400 (Thu, 24 Apr 2008) New Revision: 6660 Modified: container/jboss42/branches/jbossws-jboss422/src/main/scripts/antrun-install.xml Log: jbossws-jboss422 Modified: container/jboss42/branches/jbossws-jboss422/src/main/scripts/antrun-install.xml =================================================================== --- container/jboss42/branches/jbossws-jboss422/src/main/scripts/antrun-install.xml 2008-04-24 13:48:38 UTC (rev 6659) +++ container/jboss42/branches/jbossws-jboss422/src/main/scripts/antrun-install.xml 2008-04-24 13:50:11 UTC (rev 6660) @@ -50,11 +50,11 @@ <fail message="Cannot find ${artifact.id}-${version.id}.jar. Did you run 'mvn package'?" unless="jar.available"/>  - <property name="jboss.repository.dir" value="${jboss.local.repository}/jboss/jbossws-jboss42/${repository.id}"/> + <property name="jboss.repository.dir" value="${jboss.local.repository}/jboss/${artifact.id}/${repository.id}"/> <mkdir dir="${jboss.repository.dir}/lib"/> - <copy file="${project.target.dir}/${artifact.id}-${version.id}.jar" tofile="${jboss.repository.dir}/lib/jbossws-jboss42.jar" overwrite="true"/> - <copy file="${project.target.dir}/${artifact.id}-${version.id}-sources.jar" tofile="${jboss.repository.dir}/lib/jbossws-jboss42-src.jar" overwrite="true"/> - <copy file="${project.target.dir}/${artifact.id}-${version.id}-resources.zip" tofile="${jboss.repository.dir}/lib/jbossws-jboss42-resources.zip" overwrite="true"/> + <copy file="${project.target.dir}/${artifact.id}-${version.id}.jar" tofile="${jboss.repository.dir}/lib/${artifact.id}.jar" overwrite="true"/> + <copy file="${project.target.dir}/${artifact.id}-${version.id}-sources.jar" tofile="${jboss.repository.dir}/lib/${artifact.id}-src.jar" overwrite="true"/> + <copy file="${project.target.dir}/${artifact.id}-${version.id}-resources.zip" tofile="${jboss.repository.dir}/lib/${artifact.id}-resources.zip" overwrite="true"/> <copy file="${project.target.dir}/etc/component-info.xml" tofile="${jboss.repository.dir}/component-info.xml" overwrite="true"/> </target>

18 years

1
0
0 / 0

JBossWS SVN: r6659 - container/jboss42/branches/jbossws-jboss422/src/main/etc.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-04-24 09:48:38 -0400 (Thu, 24 Apr 2008) New Revision: 6659 Modified: container/jboss42/branches/jbossws-jboss422/src/main/etc/component-info.xml Log: jbossws-jboss422 Modified: container/jboss42/branches/jbossws-jboss422/src/main/etc/component-info.xml =================================================================== --- container/jboss42/branches/jbossws-jboss422/src/main/etc/component-info.xml 2008-04-24 13:43:43 UTC (rev 6658) +++ container/jboss42/branches/jbossws-jboss422/src/main/etc/component-info.xml 2008-04-24 13:48:38 UTC (rev 6659) @@ -1,22 +1,26 @@ -<project name="jboss/jbossws-jboss42"> +<project name="jboss/jbossws-jboss422"> - <component id="jboss/jbossws-jboss42" + <component id="jboss/jbossws-jboss422" description="JBossWS container integration layer" - version="${version}" + version="@repository.id@" licenseType="lgpl"> - <artifact id="jbossws-jboss42.jar"/> - <artifact id="jbossws-jboss42-src.zip"/> + <artifact id="jbossws-jboss422.jar"/> + <artifact id="jbossws-jboss422-src.jar"/> + <artifact id="jbossws-jboss422-resources.zip"/> <import componentref="jboss/jbossws-common"> - <compatible version="${jbossws.common.version}"/> + <compatible version="@jbossws-common@"/> </import> + <import componentref="jboss/jbossws-framework"> + <compatible version="@jbossws-framework@"/> + </import> <import componentref="jboss/jbossws-spi"> - <compatible version="${jbossws.spi.version}"/> + <compatible version="@jbossws-spi@"/> </import> <export> - <include input="jbossws-jboss42.jar"/> + <include input="jbossws-jboss422.jar"/> </export> </component>

18 years

1
0
0 / 0

JBossWS SVN: r6658 - in container/jboss42/branches/jbossws-jboss422: src/main/scripts and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-04-24 09:43:43 -0400 (Thu, 24 Apr 2008) New Revision: 6658 Modified: container/jboss42/branches/jbossws-jboss422/pom.xml container/jboss42/branches/jbossws-jboss422/src/main/scripts/antrun-install.xml Log: snapshot org.jboss.ws:jbossws-jboss422:1.0.0-SNAPSHOT Modified: container/jboss42/branches/jbossws-jboss422/pom.xml =================================================================== --- container/jboss42/branches/jbossws-jboss422/pom.xml 2008-04-24 12:51:45 UTC (rev 6657) +++ container/jboss42/branches/jbossws-jboss422/pom.xml 2008-04-24 13:43:43 UTC (rev 6658) @@ -4,9 +4,9 @@ <name>JBoss Web Services - Container JBoss-4.2.2</name> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss</artifactId> + <artifactId>jbossws-jboss422</artifactId> - <version>4.2.2-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version>  <parent> @@ -189,6 +189,7 @@ </goals> <configuration> <tasks> + <property name="artifact.id" value="${project.artifactId}"/> <property name="version.id" value="${project.version}"/> <property name="jboss.local.repository" value="${jboss.local.repository}"/> <ant antfile="src/main/scripts/antrun-install.xml" target="install"/> Modified: container/jboss42/branches/jbossws-jboss422/src/main/scripts/antrun-install.xml =================================================================== --- container/jboss42/branches/jbossws-jboss422/src/main/scripts/antrun-install.xml 2008-04-24 12:51:45 UTC (rev 6657) +++ container/jboss42/branches/jbossws-jboss422/src/main/scripts/antrun-install.xml 2008-04-24 13:43:43 UTC (rev 6658) @@ -46,15 +46,15 @@ <target name="install" depends="check-properties" description="Install to jboss.local.repository">  - <available property="jbossws.jboss.jar.available" file="${project.target.dir}/jbossws-jboss-${version.id}.jar"/> - <fail message="Cannot find jbossws-jboss-${version.id}.jar. Did you run 'mvn package'?" unless="jbossws.jboss.jar.available"/> + <available property="jar.available" file="${project.target.dir}/${artifact.id}-${version.id}.jar"/> + <fail message="Cannot find ${artifact.id}-${version.id}.jar. Did you run 'mvn package'?" unless="jar.available"/>  <property name="jboss.repository.dir" value="${jboss.local.repository}/jboss/jbossws-jboss42/${repository.id}"/> <mkdir dir="${jboss.repository.dir}/lib"/> - <copy file="${project.target.dir}/jbossws-jboss-${version.id}.jar" tofile="${jboss.repository.dir}/lib/jbossws-jboss42.jar" overwrite="true"/> - <copy file="${project.target.dir}/jbossws-jboss-${version.id}-sources.jar" tofile="${jboss.repository.dir}/lib/jbossws-jboss42-src.jar" overwrite="true"/> - <copy file="${project.target.dir}/jbossws-jboss-${version.id}-resources.zip" tofile="${jboss.repository.dir}/lib/jbossws-jboss42-resources.zip" overwrite="true"/> + <copy file="${project.target.dir}/${artifact.id}-${version.id}.jar" tofile="${jboss.repository.dir}/lib/jbossws-jboss42.jar" overwrite="true"/> + <copy file="${project.target.dir}/${artifact.id}-${version.id}-sources.jar" tofile="${jboss.repository.dir}/lib/jbossws-jboss42-src.jar" overwrite="true"/> + <copy file="${project.target.dir}/${artifact.id}-${version.id}-resources.zip" tofile="${jboss.repository.dir}/lib/jbossws-jboss42-resources.zip" overwrite="true"/> <copy file="${project.target.dir}/etc/component-info.xml" tofile="${jboss.repository.dir}/component-info.xml" overwrite="true"/> </target>

18 years

1
0
0 / 0

JBossWS SVN: r6657 - container/jboss42/branches/jbossws-jboss423.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-04-24 08:51:45 -0400 (Thu, 24 Apr 2008) New Revision: 6657 Modified: container/jboss42/branches/jbossws-jboss423/pom.xml Log: Cannot deploy-file to snaphot repo. Modified: container/jboss42/branches/jbossws-jboss423/pom.xml =================================================================== --- container/jboss42/branches/jbossws-jboss423/pom.xml 2008-04-24 12:03:18 UTC (rev 6656) +++ container/jboss42/branches/jbossws-jboss423/pom.xml 2008-04-24 12:51:45 UTC (rev 6657) @@ -17,6 +17,16 @@  <properties> +  <jboss.version>4.2.3-SNAPSHOT</jboss.version> <jbossws.common.version>3.0.0-SNAPSHOT</jbossws.common.version> <jbossws.spi.version>3.0.0-SNAPSHOT</jbossws.spi.version>

18 years

1
0
0 / 0

JBossWS SVN: r6656 - in container/jboss42/branches/jbossws-jboss423: src/main and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-04-24 08:03:18 -0400 (Thu, 24 Apr 2008) New Revision: 6656 Added: container/jboss42/branches/jbossws-jboss423/pom.xml container/jboss42/branches/jbossws-jboss423/src/main/scripts/ container/jboss42/branches/jbossws-jboss423/src/main/scripts/antrun-install.xml container/jboss42/branches/jbossws-jboss423/src/main/scripts/assembly-resources.xml Modified: container/jboss42/branches/jbossws-jboss423/ Log: Switch build to maven Property changes on: container/jboss42/branches/jbossws-jboss423 ___________________________________________________________________ Name: svn:ignore - .settings + .settings target Added: container/jboss42/branches/jbossws-jboss423/pom.xml =================================================================== --- container/jboss42/branches/jbossws-jboss423/pom.xml (rev 0) +++ container/jboss42/branches/jbossws-jboss423/pom.xml 2008-04-24 12:03:18 UTC (rev 6656) @@ -0,0 +1,219 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <name>JBoss Web Services - Container JBoss-4.2.3</name> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss</artifactId> + + <version>4.2.3-SNAPSHOT</version> + +  + <parent> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-parent</artifactId> + <version>1.0-SNAPSHOT</version> + </parent> + +  + <properties> + <jboss.version>4.2.3-SNAPSHOT</jboss.version> + <jbossws.common.version>3.0.0-SNAPSHOT</jbossws.common.version> + <jbossws.spi.version>3.0.0-SNAPSHOT</jbossws.spi.version> + +  + <dom4j.version>1.6.1</dom4j.version> + <jboss.aop.version>1.5.6.GA</jboss.aop.version> + <jboss.common.version>1.2.1.GA</jboss.common.version> + <jboss.microcontainer.version>1.0.2</jboss.microcontainer.version> + <jbossxb.version>1.0.0.SP1</jbossxb.version> + </properties> + +  + <dependencies> + +  + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-common</artifactId> + <version>${jbossws.common.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-spi</artifactId> + <version>${jbossws.spi.version}</version> + </dependency> + +  + <dependency> + <groupId>javax.ejb</groupId> + <artifactId>ejb-api</artifactId> + <version>3.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.jws</groupId> + <artifactId>jsr181-api</artifactId> + <version>1.0-MR1</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.5</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.transaction</groupId> + <artifactId>jta</artifactId> + <version>1.0.1B</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.xml</groupId> + <artifactId>jaxrpc-api</artifactId> + <version>1.1</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.xml.soap</groupId> + <artifactId>saaj-api</artifactId> + <version>1.3</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.xml.ws</groupId> + <artifactId>jaxws-api</artifactId> + <version>2.1</version> + <scope>provided</scope> + </dependency> + +  + <dependency> + <groupId>dom4j</groupId> + <artifactId>dom4j</artifactId> + <version>${dom4j.version}</version> + </dependency> + <dependency> + <groupId>jboss.aop</groupId> + <artifactId>jboss-aop-jdk50</artifactId> + <version>${jboss.aop.version}</version> + </dependency> + <dependency> + <groupId>jboss</groupId> + <artifactId>jboss-system</artifactId> + <version>${jboss.version}</version> + </dependency> + <dependency> + <groupId>jboss</groupId> + <artifactId>jboss</artifactId> + <version>${jboss.version}</version> + </dependency> + <dependency> + <groupId>jboss</groupId> + <artifactId>jboss-annotations-ejb3</artifactId> + <version>${jboss.version}</version> + </dependency> + <dependency> + <groupId>jboss</groupId> + <artifactId>jboss-ejb3</artifactId> + <version>${jboss.version}</version> + </dependency> + <dependency> + <groupId>jboss</groupId> + <artifactId>jboss-ejb3x</artifactId> + <version>${jboss.version}</version> + </dependency> + <dependency> + <groupId>jboss</groupId> + <artifactId>jboss-jmx</artifactId> + <version>${jboss.version}</version> + </dependency> + <dependency> + <groupId>jboss</groupId> + <artifactId>jbosssx</artifactId> + <version>${jboss.version}</version> + </dependency> + <dependency> + <groupId>jboss.common</groupId> + <artifactId>jboss-common</artifactId> + <version>${jboss.common.version}</version> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jbossxb</artifactId> + <version>${jbossxb.version}</version> +  + <exclusions> + <exclusion> + <groupId>jboss.common.core</groupId> + <artifactId>jboss-common-core</artifactId> + </exclusion> + <exclusion> + <groupId>jboss.logging</groupId> + <artifactId>jboss-logging-spi</artifactId> + </exclusion> + <exclusion> + <groupId>jboss.logging.log4j</groupId> + <artifactId>jboss-logging-log4j</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.jboss.microcontainer</groupId> + <artifactId>jboss-microcontainer</artifactId> + <version>${jboss.microcontainer.version}</version> + </dependency> + </dependencies> + +  + <build> + <resources> + <resource> + <targetPath>../etc</targetPath> + <directory>src/main/etc</directory> + <filtering>true</filtering> + </resource> + <resource> + <directory>src/main/resources/jbossws-jboss42.jar</directory> + </resource> + </resources> + <plugins> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <phase>install</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <property name="version.id" value="${project.version}"/> + <property name="jboss.local.repository" value="${jboss.local.repository}"/> + <ant antfile="src/main/scripts/antrun-install.xml" target="install"/> + </tasks> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <descriptors> + <descriptor>src/main/scripts/assembly-resources.xml</descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + +</project> Property changes on: container/jboss42/branches/jbossws-jboss423/pom.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: container/jboss42/branches/jbossws-jboss423/src/main/scripts/antrun-install.xml =================================================================== --- container/jboss42/branches/jbossws-jboss423/src/main/scripts/antrun-install.xml (rev 0) +++ container/jboss42/branches/jbossws-jboss423/src/main/scripts/antrun-install.xml 2008-04-24 12:03:18 UTC (rev 6656) @@ -0,0 +1,61 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + + +<project> + +  +  +  + + <property name="project.dir" value="${basedir}"/> + <property name="project.etc.dir" value="${project.dir}/src/main/etc"/> + <property name="project.target.dir" value="${project.dir}/target"/> + +  +  +  + + <target name="init"> + <property name="repository.id" value="${version.id}"/> + <echo message="version.id=${version.id}"/> + <echo message="repository.id=${repository.id}"/> + <echo message="jboss.local.repository=${jboss.local.repository}"/> + </target> + + <target name="check-properties" depends="init"> + <available property="jboss.local.repository.available" type="dir" file="${jboss.local.repository}"/> + <fail message="Cannot find directory ${jboss.local.repository}. Did you copy profiles-example.xml?" unless="jboss.local.repository.available"/> + </target> + + +  +  +  + +  + <target name="install" depends="check-properties" description="Install to jboss.local.repository"> + +  + <available property="jbossws.jboss.jar.available" file="${project.target.dir}/jbossws-jboss-${version.id}.jar"/> + <fail message="Cannot find jbossws-jboss-${version.id}.jar. Did you run 'mvn package'?" unless="jbossws.jboss.jar.available"/> + +  + <property name="jboss.repository.dir" value="${jboss.local.repository}/jboss/jbossws-jboss42/${repository.id}"/> + <mkdir dir="${jboss.repository.dir}/lib"/> + <copy file="${project.target.dir}/jbossws-jboss-${version.id}.jar" tofile="${jboss.repository.dir}/lib/jbossws-jboss42.jar" overwrite="true"/> + <copy file="${project.target.dir}/jbossws-jboss-${version.id}-sources.jar" tofile="${jboss.repository.dir}/lib/jbossws-jboss42-src.jar" overwrite="true"/> + <copy file="${project.target.dir}/jbossws-jboss-${version.id}-resources.zip" tofile="${jboss.repository.dir}/lib/jbossws-jboss42-resources.zip" overwrite="true"/> + <copy file="${project.target.dir}/etc/component-info.xml" tofile="${jboss.repository.dir}/component-info.xml" overwrite="true"/> + </target> + +</project> Property changes on: container/jboss42/branches/jbossws-jboss423/src/main/scripts/antrun-install.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: container/jboss42/branches/jbossws-jboss423/src/main/scripts/assembly-resources.xml =================================================================== --- container/jboss42/branches/jbossws-jboss423/src/main/scripts/assembly-resources.xml (rev 0) +++ container/jboss42/branches/jbossws-jboss423/src/main/scripts/assembly-resources.xml 2008-04-24 12:03:18 UTC (rev 6656) @@ -0,0 +1,18 @@ +<assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd"> + <id>resources</id> + <formats> + <format>zip</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + <fileSets> + <fileSet> + <directory>src/main/resources</directory> + <outputDirectory>/</outputDirectory> + <includes> + <include>jbossws-jboss42.sar/**</include> + <include>jbossws-jboss42-config.xml</include> + </includes> + </fileSet> + </fileSets> +</assembly> \ No newline at end of file Property changes on: container/jboss42/branches/jbossws-jboss423/src/main/scripts/assembly-resources.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF

18 years

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits April 2008