April 2008 - jbossws-commits - Jboss List Archives

JBossWS SVN: r6726 - container/jboss50/branches.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2008-04-28 10:41:20 -0400 (Mon, 28 Apr 2008) New Revision: 6726 Removed: container/jboss50/branches/ropalka/ Log: removing obsolete branch - it was already merged to trunk few months ago

17 years, 8 months

1
0
0 / 0

JBossWS SVN: r6725 - container/jboss42/branches.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2008-04-28 10:39:19 -0400 (Mon, 28 Apr 2008) New Revision: 6725 Removed: container/jboss42/branches/ropalka/ Log: removing obsolete branch - it was already merged to trunk few months ago

17 years, 8 months

1
0
0 / 0

JBossWS SVN: r6724 - in stack/metro/trunk: ant-import and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-04-28 09:54:22 -0400 (Mon, 28 Apr 2008) New Revision: 6724 Modified: stack/metro/trunk/ant-import/build-thirdparty.xml stack/metro/trunk/version.properties Log: update dependencies Modified: stack/metro/trunk/ant-import/build-thirdparty.xml =================================================================== --- stack/metro/trunk/ant-import/build-thirdparty.xml 2008-04-28 13:53:51 UTC (rev 6723) +++ stack/metro/trunk/ant-import/build-thirdparty.xml 2008-04-28 13:54:22 UTC (rev 6724) @@ -52,29 +52,7 @@ thirdpartry-get --> - <target name="get422-jars" if="jbossws.integration.jboss422"> - <mkdir dir="${thirdparty.dir}"/> - <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss422}/lib/jbossws-jboss42.jar" dest="${thirdparty.dir}/jbossws-jboss42.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss422}/lib/jbossws-jboss42-src.zip" dest="${thirdparty.dir}/jbossws-jboss42-src.zip" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss422}/lib/jbossws-jboss42-resources.zip" dest="${thirdparty.dir}/jbossws-jboss42-resources.zip" usetimestamp="true" verbose="true"/> - </target> - - <target name="get423-jars" if="jbossws.integration.jboss423"> - <mkdir dir="${thirdparty.dir}"/> - <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss423}/lib/jbossws-jboss42.jar" dest="${thirdparty.dir}/jbossws-jboss42.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss423}/lib/jbossws-jboss42-src.zip" dest="${thirdparty.dir}/jbossws-jboss42-src.zip" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss423}/lib/jbossws-jboss42-resources.zip" dest="${thirdparty.dir}/jbossws-jboss42-resources.zip" usetimestamp="true" verbose="true"/> - </target> - - <target name="get501-jars" if="jbossws.integration.jboss501"> - <mkdir dir="${thirdparty.dir}"/> - <get src="${jboss.repository}/jboss/jbossws-jboss50/${jbossws-jboss501}/lib/jbossws-jboss50.jar" dest="${thirdparty.dir}/jbossws-jboss50.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws-jboss50/${jbossws-jboss501}/lib/jbossws-jboss50-src.zip" dest="${thirdparty.dir}/jbossws-jboss50-src.zip" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws-jboss50/${jbossws-jboss501}/lib/jbossws-jboss50-container.jar" dest="${thirdparty.dir}/jbossws-jboss50-container.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws-jboss50/${jbossws-jboss501}/lib/jbossws-jboss50-deployer-resources.zip" dest="${thirdparty.dir}/jbossws-jboss50-deployer-resources.zip" usetimestamp="true" verbose="true"/> - </target> - - <target name="thirdparty-get" depends="thirdparty-delete, get422-jars, get423-jars, get501-jars" + <target name="thirdparty-get" depends="thirdparty-delete" if="force.thirdparty.get" description="Gets the thirdparty libraries"> <mkdir dir="${thirdparty.dir}"/> @@ -82,7 +60,20 @@ <get src="${jboss.repository}/jboss/jbossws-framework/${jbossws-framework}/lib/jbossws-framework.jar" dest="${thirdparty.dir}/jbossws-framework.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossws-framework/${jbossws-framework}/lib/jbossws-framework-scripts.zip" dest="${thirdparty.dir}/jbossws-framework-scripts.zip" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi.jar" dest="${thirdparty.dir}/jbossws-spi.jar" usetimestamp="true" verbose="true"/> - + <get src="${jboss.repository}/jboss/jbossws-jboss422/${jbossws-jboss422}/lib/jbossws-jboss422.jar" dest="${thirdparty.dir}/jbossws-jboss422.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-jboss422/${jbossws-jboss422}/lib/jbossws-jboss422-src.jar" dest="${thirdparty.dir}/jbossws-jboss422-src.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-jboss422/${jbossws-jboss422}/lib/jbossws-jboss422-resources.zip" dest="${thirdparty.dir}/jbossws-jboss422-resources.zip" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-jboss423/${jbossws-jboss423}/lib/jbossws-jboss423.jar" dest="${thirdparty.dir}/jbossws-jboss423.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-jboss423/${jbossws-jboss423}/lib/jbossws-jboss423-src.jar" dest="${thirdparty.dir}/jbossws-jboss423-src.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-jboss423/${jbossws-jboss423}/lib/jbossws-jboss423-resources.zip" dest="${thirdparty.dir}/jbossws-jboss423-resources.zip" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-jboss500/${jbossws-jboss500}/lib/jbossws-jboss500.jar" dest="${thirdparty.dir}/jbossws-jboss500.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-jboss500/${jbossws-jboss500}/lib/jbossws-jboss500-container.jar" dest="${thirdparty.dir}/jbossws-jboss500-container.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-jboss500/${jbossws-jboss500}/lib/jbossws-jboss500-src.jar" dest="${thirdparty.dir}/jbossws-jboss500-src.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-jboss500/${jbossws-jboss500}/lib/jbossws-jboss500-resources.zip" dest="${thirdparty.dir}/jbossws-jboss500-resources.zip" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-jboss501/${jbossws-jboss501}/lib/jbossws-jboss501.jar" dest="${thirdparty.dir}/jbossws-jboss501.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-jboss501/${jbossws-jboss501}/lib/jbossws-jboss501-container.jar" dest="${thirdparty.dir}/jbossws-jboss501-container.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-jboss501/${jbossws-jboss501}/lib/jbossws-jboss501-src.jar" dest="${thirdparty.dir}/jbossws-jboss501-src.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-jboss501/${jbossws-jboss501}/lib/jbossws-jboss501-resources.zip" dest="${thirdparty.dir}/jbossws-jboss501-resources.zip" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j.jar" dest="${thirdparty.dir}/wsdl4j.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core.jar" dest="${thirdparty.dir}/jboss-common-core.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core-sources.jar" dest="${thirdparty.dir}/jboss-common-core-sources.jar" usetimestamp="true" verbose="true"/> Modified: stack/metro/trunk/version.properties =================================================================== --- stack/metro/trunk/version.properties 2008-04-28 13:53:51 UTC (rev 6723) +++ stack/metro/trunk/version.properties 2008-04-28 13:54:22 UTC (rev 6724) @@ -18,9 +18,10 @@ jbossws-common=3.0.0-SNAPSHOT jbossws-framework=3.0.2-SNAPSHOT -jbossws-jboss422=4.2.2.DEV -jbossws-jboss423=4.2.3.DEV -jbossws-jboss501=5.0.1.DEV +jbossws-jboss422=3.0.0-SNAPSHOT +jbossws-jboss423=3.0.0-SNAPSHOT +jbossws-jboss500=3.0.0-SNAPSHOT +jbossws-jboss501=3.0.0-SNAPSHOT junit=3.8.1 jboss-common-core=2.0.2.GA

17 years, 8 months

1
0
0 / 0

JBossWS SVN: r6723 - stack/native/trunk/ant-import.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-04-28 09:53:51 -0400 (Mon, 28 Apr 2008) New Revision: 6723 Modified: stack/native/trunk/ant-import/build-deploy.xml stack/native/trunk/ant-import/build-setup.xml stack/native/trunk/ant-import/jbossws-deploy-macros.xml Log: update stack deployment Modified: stack/native/trunk/ant-import/build-deploy.xml =================================================================== --- stack/native/trunk/ant-import/build-deploy.xml 2008-04-28 13:40:39 UTC (rev 6722) +++ stack/native/trunk/ant-import/build-deploy.xml 2008-04-28 13:53:51 UTC (rev 6723) @@ -150,7 +150,6 @@ <target name="undeploy-jboss500" depends="deploy-target-jboss500" 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}"/> - <macro-undeploy-deployer targetdir="${jboss500.server.deploy}/jbossws.sar"/> <delete dir="${jboss500.server.deploy}/juddi-service.sar"/> </target> @@ -174,7 +173,6 @@ <target name="undeploy-jboss501" depends="deploy-target-jboss501" 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}"/> - <macro-undeploy-deployer targetdir="${jboss501.server.deploy}/jbossws.sar"/> <delete dir="${jboss501.server.deploy}/juddi-service.sar"/> </target> Modified: stack/native/trunk/ant-import/build-setup.xml =================================================================== --- stack/native/trunk/ant-import/build-setup.xml 2008-04-28 13:40:39 UTC (rev 6722) +++ stack/native/trunk/ant-import/build-setup.xml 2008-04-28 13:53:51 UTC (rev 6723) @@ -12,114 +12,134 @@  <project> - -  -  -  - -  - <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 file="${basedir}/version.properties"/> - - <property name="jboss421.lib" value="${jboss421.home}/lib"/> - <property name="jboss421.client" value="${jboss421.home}/client"/> - <property name="jboss421.server" value="${jboss421.home}/server/${jboss.server.instance}"/> - <property name="jboss421.server.lib" value="${jboss421.server}/lib"/> - <property name="jboss421.server.deploy" value="${jboss421.server}/deploy"/> - - <property name="jboss422.lib" value="${jboss422.home}/lib"/> - <property name="jboss422.client" value="${jboss422.home}/client"/> - <property name="jboss422.server" value="${jboss422.home}/server/${jboss.server.instance}"/> - <property name="jboss422.server.lib" value="${jboss422.server}/lib"/> - <property name="jboss422.server.deploy" value="${jboss422.server}/deploy"/> - - <property name="jboss423.lib" value="${jboss423.home}/lib"/> - <property name="jboss423.client" value="${jboss423.home}/client"/> - <property name="jboss423.server" value="${jboss423.home}/server/${jboss.server.instance}"/> - <property name="jboss423.server.lib" value="${jboss423.server}/lib"/> - <property name="jboss423.server.deploy" value="${jboss423.server}/deploy"/> - - <property name="jboss500.lib" value="${jboss500.home}/lib"/> - <property name="jboss500.client" value="${jboss500.home}/client"/> - <property name="jboss500.server" value="${jboss500.home}/server/${jboss.server.instance}"/> - <property name="jboss500.server.lib" value="${jboss500.server}/lib"/> - <property name="jboss500.server.deploy" value="${jboss500.server}/deploy"/> - <property name="jboss500.server.deployers" value="${jboss500.server}/deployers"/> - - <property name="jboss501.lib" value="${jboss501.home}/lib"/> - <property name="jboss501.client" value="${jboss501.home}/client"/> - <property name="jboss501.server" value="${jboss501.home}/server/${jboss.server.instance}"/> - <property name="jboss501.server.lib" value="${jboss501.server}/lib"/> - <property name="jboss501.server.deploy" value="${jboss501.server}/deploy"/> - <property name="jboss501.server.deployers" value="${jboss501.server}/deployers"/> - - <property name="jboss.server.instance.${jboss.server.instance}" value="true"/> - - <property name="jboss421.available.file" value="${jboss421.client}/jboss-client.jar"/> - <property name="jboss422.available.file" value="${jboss422.client}/jboss-client.jar"/> - <property name="jboss423.available.file" value="${jboss423.client}/jboss-client.jar"/> - <property name="jboss500.available.file" value="${jboss500.client}/jboss-client.jar"/> - <property name="jboss501.available.file" value="${jboss501.client}/jboss-client.jar"/> - - <available property="jboss421.available" file="${jboss421.available.file}"/> - <available property="jboss422.available" file="${jboss422.available.file}"/> - <available property="jboss423.available" file="${jboss423.available.file}"/> - <available property="jboss500.available" file="${jboss500.available.file}"/> - <available property="jboss501.available" file="${jboss501.available.file}"/> - - <condition property="jbossws.integration.jboss421" value="true"> + +  +  +  + +  + <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 file="${basedir}/version.properties"/> + + <property name="jboss421.lib" value="${jboss421.home}/lib"/> + <property name="jboss421.client" value="${jboss421.home}/client"/> + <property name="jboss421.server" value="${jboss421.home}/server/${jboss.server.instance}"/> + <property name="jboss421.server.lib" value="${jboss421.server}/lib"/> + <property name="jboss421.server.deploy" value="${jboss421.server}/deploy"/> + + <property name="jboss422.lib" value="${jboss422.home}/lib"/> + <property name="jboss422.client" value="${jboss422.home}/client"/> + <property name="jboss422.server" value="${jboss422.home}/server/${jboss.server.instance}"/> + <property name="jboss422.server.lib" value="${jboss422.server}/lib"/> + <property name="jboss422.server.deploy" value="${jboss422.server}/deploy"/> + + <property name="jboss423.lib" value="${jboss423.home}/lib"/> + <property name="jboss423.client" value="${jboss423.home}/client"/> + <property name="jboss423.server" value="${jboss423.home}/server/${jboss.server.instance}"/> + <property name="jboss423.server.lib" value="${jboss423.server}/lib"/> + <property name="jboss423.server.deploy" value="${jboss423.server}/deploy"/> + + <property name="jboss500.lib" value="${jboss500.home}/lib"/> + <property name="jboss500.client" value="${jboss500.home}/client"/> + <property name="jboss500.server" value="${jboss500.home}/server/${jboss.server.instance}"/> + <property name="jboss500.server.lib" value="${jboss500.server}/lib"/> + <property name="jboss500.server.deploy" value="${jboss500.server}/deploy"/> + <property name="jboss500.server.deployers" value="${jboss500.server}/deployers"/> + + <property name="jboss501.lib" value="${jboss501.home}/lib"/> + <property name="jboss501.client" value="${jboss501.home}/client"/> + <property name="jboss501.server" value="${jboss501.home}/server/${jboss.server.instance}"/> + <property name="jboss501.server.lib" value="${jboss501.server}/lib"/> + <property name="jboss501.server.deploy" value="${jboss501.server}/deploy"/> + <property name="jboss501.server.deployers" value="${jboss501.server}/deployers"/> + + <property name="jboss.server.instance.${jboss.server.instance}" value="true"/> + + <property name="jboss421.available.file" value="${jboss421.client}/jboss-client.jar"/> + <property name="jboss422.available.file" value="${jboss422.client}/jboss-client.jar"/> + <property name="jboss423.available.file" value="${jboss423.client}/jboss-client.jar"/> + <property name="jboss500.available.file" value="${jboss500.client}/jboss-client.jar"/> + <property name="jboss501.available.file" value="${jboss501.client}/jboss-client.jar"/> + + <available property="jboss421.available" file="${jboss421.available.file}"/> + <available property="jboss422.available" file="${jboss422.available.file}"/> + <available property="jboss423.available" file="${jboss423.available.file}"/> + <available property="jboss500.available" file="${jboss500.available.file}"/> + <available property="jboss501.available" file="${jboss501.available.file}"/> + + <condition property="jbossws.integration.jboss421" value="true"> + <equals arg1="${jbossws.integration.target}" arg2="jboss421"/> + </condition> + <condition property="jbossws.integration.jboss422" value="true"> + <equals arg1="${jbossws.integration.target}" arg2="jboss422"/> + </condition> + <condition property="jbossws.integration.jboss423" value="true"> + <equals arg1="${jbossws.integration.target}" arg2="jboss423"/> + </condition> + <condition property="jbossws.integration.jboss500" value="true"> + <equals arg1="${jbossws.integration.target}" arg2="jboss500"/> + </condition> + <condition property="jbossws.integration.jboss501" value="true"> + <equals arg1="${jbossws.integration.target}" arg2="jboss501"/> + </condition> + + <condition property="jbossws.integration.jboss42" value="true"> + <or> <equals arg1="${jbossws.integration.target}" arg2="jboss421"/> - </condition> - - <condition property="jbossws.integration.jboss422" value="true"> <equals arg1="${jbossws.integration.target}" arg2="jboss422"/> - </condition> - - <condition property="jbossws.integration.jboss423" value="true"> <equals arg1="${jbossws.integration.target}" arg2="jboss423"/> - </condition> - - <condition property="jbossws.integration.jboss500" value="true"> + </or> + </condition> + <condition property="jbossws.integration.jboss50" value="true"> + <or> <equals arg1="${jbossws.integration.target}" arg2="jboss500"/> - </condition> - - <condition property="jbossws.integration.jboss501" value="true"> <equals arg1="${jbossws.integration.target}" arg2="jboss501"/> - </condition> - - <condition property="jbossws.integration.jboss42" value="true"> - <or> - <equals arg1="${jbossws.integration.target}" arg2="jboss421"/> - <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> - - <available property="jbossws.portal.content.available" file="${jbossws.portal.content}" type="dir"/> - -  - <available classname="java.lang.Enum" property="HAVE_JDK_1.5"/> - <available classname="java.io.Console" property="HAVE_JDK_1.6"/> - - <fail message="JDK1.5 or above is required" unless="HAVE_JDK_1.5"/> - -  -  -  - - <target name="prepare"> - <tstamp> - <format property="build.id" pattern="yyyyMMddHHmm"/> - </tstamp> - </target> - + </or> + </condition> + +  + <condition property="jboss.home" value="${jboss421.home}"> + <equals arg1="${jbossws.integration.target}" arg2="jboss421"/> + </condition> + <condition property="jboss.home" value="${jboss422.home}"> + <equals arg1="${jbossws.integration.target}" arg2="jboss422"/> + </condition> + <condition property="jboss.home" value="${jboss423.home}"> + <equals arg1="${jbossws.integration.target}" arg2="jboss423"/> + </condition> + <condition property="jboss.home" value="${jboss500.home}"> + <equals arg1="${jbossws.integration.target}" arg2="jboss500"/> + </condition> + <condition property="jboss.home" value="${jboss501.home}"> + <equals arg1="${jbossws.integration.target}" arg2="jboss501"/> + </condition> + + <property name="jboss.client" value="${jboss.home}/client"/> + <property name="jboss.lib" value="${jboss.home}/lib"/> + <property name="jboss.server" value="${jboss.home}/server/${jboss.server.instance}"/> + <property name="jboss.server.lib" value="${jboss.server}/lib"/> + <property name="jboss.server.deploy" value="${jboss.server}/deploy"/> + <property name="jboss.server.deployers" value="${jboss.server}/deployers"/> + + <available property="jbossws.portal.content.available" file="${jbossws.portal.content}" type="dir"/> + +  + <available classname="java.lang.Enum" property="HAVE_JDK_1.5"/> + <available classname="java.io.Console" property="HAVE_JDK_1.6"/> + + <fail message="JDK1.5 or above is required" unless="HAVE_JDK_1.5"/> + +  +  +  + + <target name="prepare"> + <tstamp> + <format property="build.id" pattern="yyyyMMddHHmm"/> + </tstamp> + </target> + </project> Modified: stack/native/trunk/ant-import/jbossws-deploy-macros.xml =================================================================== --- stack/native/trunk/ant-import/jbossws-deploy-macros.xml 2008-04-28 13:40:39 UTC (rev 6722) +++ stack/native/trunk/ant-import/jbossws-deploy-macros.xml 2008-04-28 13:53:51 UTC (rev 6723) @@ -364,8 +364,8 @@  <delete> - <fileset dir="${jboss.server.home}/lib"> - <include name="jbossws-jboss*.jar"/> + <fileset dir="${jboss.server.home}"> + <include name="**/jbossws-jboss*.jar"/> </fileset> <fileset dir="${jboss.home}/client"> <include name="jbossws-jboss*.jar"/> @@ -383,16 +383,4 @@ </sequential> </macrodef> - <macrodef name="macro-undeploy-deployer"> - <attribute name="targetdir"/> - <sequential> - <property name="jboss.server.home" value="@{targetdir}/../.."/> - <delete> - <fileset dir="${jboss.server.home}/deployers/jbossws.deployer"> - <include name="jbossws-jboss*.jar"/> - </fileset> - </delete> - </sequential> - </macrodef> - </project> \ No newline at end of file

17 years, 8 months

1
0
0 / 0

JBossWS SVN: r6722 - framework/trunk/testsuite/test/ant-import.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-04-28 09:40:39 -0400 (Mon, 28 Apr 2008) New Revision: 6722 Modified: framework/trunk/testsuite/test/ant-import/build-testsuite.xml Log: Fix paths ti client integration layers Modified: framework/trunk/testsuite/test/ant-import/build-testsuite.xml =================================================================== --- framework/trunk/testsuite/test/ant-import/build-testsuite.xml 2008-04-28 13:17:34 UTC (rev 6721) +++ framework/trunk/testsuite/test/ant-import/build-testsuite.xml 2008-04-28 13:40:39 UTC (rev 6722) @@ -168,8 +168,9 @@ <pathelement location="${jboss.client}/jboss-ejb3-client.jar"/> <pathelement location="${jboss.client}/jboss-remoting.jar"/> <pathelement location="${jboss.client}/jboss-xml-binding.jar"/> - <pathelement location="${jboss.client}/jbossws-jboss42.jar"/> <pathelement location="${jboss.client}/jbossws-jboss421.jar"/> + <pathelement location="${jboss.client}/jbossws-jboss422.jar"/> + <pathelement location="${jboss.client}/jbossws-jboss423.jar"/> <pathelement location="${jboss.client}/jbossall-client.jar"/> <pathelement location="${jboss.client}/log4j.jar"/> <pathelement location="${jboss.client}/mail.jar"/> @@ -229,7 +230,8 @@ <pathelement location="${jboss.client}/jboss-wsit-tools.jar"/> <pathelement location="${jboss.client}/jboss-xml-binding.jar"/> <pathelement location="${jboss.client}/jbossall-client.jar"/> - <pathelement location="${jboss.client}/jbossws-jboss50.jar"/> + <pathelement location="${jboss.client}/jbossws-jboss500.jar"/> + <pathelement location="${jboss.client}/jbossws-jboss501.jar"/> <pathelement location="${jboss.client}/jaxws-tools.jar"/> <pathelement location="${jboss.client}/jboss-wsit-tools.jar"/> <pathelement location="${jboss.client}/log4j.jar"/>

17 years, 8 months

1
0
0 / 0

JBossWS SVN: r6721 - in common/trunk: src/main/java/org/jboss/ws/tools/ant and 6 other directories.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2008-04-28 09:17:34 -0400 (Mon, 28 Apr 2008) New Revision: 6721 Modified: common/trunk/build.xml common/trunk/pom.xml common/trunk/profiles-example.xml common/trunk/src/main/java/org/jboss/ws/tools/ant/EclipseClasspathTask.java common/trunk/src/main/java/org/jboss/ws/tools/ant/EclipseJUnitTestsTask.java common/trunk/src/main/java/org/jboss/ws/tools/ant/EclipseProjectTask.java common/trunk/src/main/java/org/jboss/ws/tools/ant/PathWriterTask.java common/trunk/src/main/java/org/jboss/wsf/common/KernelAwareSPIFactory.java common/trunk/src/main/java/org/jboss/wsf/common/ObjectNameFactory.java common/trunk/src/main/java/org/jboss/wsf/common/ResourceLoaderAdapter.java common/trunk/src/main/java/org/jboss/wsf/common/URLLoaderAdapter.java common/trunk/src/main/java/org/jboss/wsf/common/handler/GenericLogicalHandler.java common/trunk/src/main/java/org/jboss/wsf/common/handler/GenericSOAPHandler.java common/trunk/src/main/java/org/jboss/wsf/common/logging/JDKLogRedirector.java common/trunk/src/main/java/org/jboss/wsf/common/management/AbstractServerConfigMBean.java common/trunk/src/main/java/org/jboss/wsf/common/utils/UUIDGenerator.java common/trunk/src/main/java/org/jboss/wsf/test/GenericHandler.java common/trunk/src/main/java/org/jboss/wsf/test/GenericLogicalHandler.java common/trunk/src/main/java/org/jboss/wsf/test/GenericSOAPHandler.java common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java common/trunk/src/main/java/org/jboss/wsf/test/TestDeployer.java common/trunk/src/main/java/org/jboss/wsf/test/TestDeployerJBoss.java Log: include SVN in source files Modified: common/trunk/build.xml =================================================================== --- common/trunk/build.xml 2008-04-28 12:53:20 UTC (rev 6720) +++ common/trunk/build.xml 2008-04-28 13:17:34 UTC (rev 6721) @@ -13,57 +13,57 @@ <project name="JBossWS-Common" default="main" basedir="."> -  -  -  +  +  +  - <property name="common.dir" value="${basedir}"/> - <property name="common.etc.dir" value="${common.dir}/src/main/etc"/> - <property name="common.target.dir" value="${common.dir}/target"/> + <property name="common.dir" value="${basedir}"/> + <property name="common.etc.dir" value="${common.dir}/src/main/etc"/> + <property name="common.target.dir" value="${common.dir}/target"/> -  -  -  +  +  +  - <target name="init"> - -  - <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="${common.dir}/ant.properties"/> - - <xmlproperty file="${common.dir}/pom.xml"/> - <property name="version.id" value="${project.version}"/> - <property name="repository.id" value="${project.version}"/> - - <echo message="version.id=${version.id}"/> - <echo message="repository.id=${repository.id}"/> - </target> + <target name="init"> -  -  -  - +  + <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="${common.dir}/ant.properties"/> + + <xmlproperty file="${common.dir}/pom.xml"/> + <property name="version.id" value="${project.version}"/> + <property name="repository.id" value="${project.version}"/> + + <echo message="version.id=${version.id}"/> + <echo message="repository.id=${repository.id}"/> + </target> + +  +  +  +  <target name="install" depends="init" description="Install to jboss.local.repository">  <available property="jbossws.common.jar.available" file="${common.target.dir}/jbossws-common-${version.id}.jar"/> <fail message="Cannot find jbossws-common-${version.id}.jar. Did you run 'mvn package'?" unless="jbossws.common.jar.available"/> - +  <available property="jbossws.common.sources.jar.available" file="${common.target.dir}/jbossws-common-${version.id}-sources.jar"/> <fail message="Cannot find jbossws-common-${version.id}-sources.jar. Did you run 'mvn source:jar'?" unless="jbossws.common.sources.jar.available"/> - +  <property name="jboss.repository.dir" value="${jboss.local.repository}/jboss"/> <mkdir dir="${jboss.repository.dir}/jbossws-common/${repository.id}/lib"/> <copy file="${common.target.dir}/jbossws-common-${version.id}.jar" tofile="${jboss.repository.dir}/jbossws-common/${repository.id}/lib/jbossws-common.jar" overwrite="true"/> <copy file="${common.target.dir}/jbossws-common-${version.id}-sources.jar" tofile="${jboss.repository.dir}/jbossws-common/${repository.id}/lib/jbossws-common-src.jar" overwrite="true"/> <copy file="${common.target.dir}/etc/component-info.xml" tofile="${jboss.repository.dir}/jbossws-common/${repository.id}/component-info.xml" overwrite="true"/> - </target> - + </target> +    @@ -72,6 +72,6 @@ <delete dir="${common.target.dir}"/> </target> - <target name="main" description="Executes the default target (install)." depends="install"/> + <target name="main" description="Executes the default target (install)." depends="install"/> </project> Modified: common/trunk/pom.xml =================================================================== --- common/trunk/pom.xml 2008-04-28 12:53:20 UTC (rev 6720) +++ common/trunk/pom.xml 2008-04-28 13:17:34 UTC (rev 6721) @@ -1,3 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + <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> Modified: common/trunk/profiles-example.xml =================================================================== --- common/trunk/profiles-example.xml 2008-04-28 12:53:20 UTC (rev 6720) +++ common/trunk/profiles-example.xml 2008-04-28 13:17:34 UTC (rev 6721) @@ -1,4 +1,10 @@ -<profilesXml xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" +<?xml version="1.0" encoding="UTF-8"?> + + + +<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">  @@ -15,4 +21,4 @@ </profile> </profiles> -</profilesXml> \ No newline at end of file +</profilesXml> Modified: common/trunk/src/main/java/org/jboss/ws/tools/ant/EclipseClasspathTask.java =================================================================== --- common/trunk/src/main/java/org/jboss/ws/tools/ant/EclipseClasspathTask.java 2008-04-28 12:53:20 UTC (rev 6720) +++ common/trunk/src/main/java/org/jboss/ws/tools/ant/EclipseClasspathTask.java 2008-04-28 13:17:34 UTC (rev 6721) @@ -21,6 +21,8 @@ */ package org.jboss.ws.tools.ant; +// $Id$ + import java.io.BufferedReader; import java.io.BufferedWriter; import java.io.File; Modified: common/trunk/src/main/java/org/jboss/ws/tools/ant/EclipseJUnitTestsTask.java =================================================================== --- common/trunk/src/main/java/org/jboss/ws/tools/ant/EclipseJUnitTestsTask.java 2008-04-28 12:53:20 UTC (rev 6720) +++ common/trunk/src/main/java/org/jboss/ws/tools/ant/EclipseJUnitTestsTask.java 2008-04-28 13:17:34 UTC (rev 6721) @@ -21,6 +21,8 @@ */ package org.jboss.ws.tools.ant; +// $Id$ + import java.io.BufferedWriter; import java.io.File; import java.io.FileWriter; Modified: common/trunk/src/main/java/org/jboss/ws/tools/ant/EclipseProjectTask.java =================================================================== --- common/trunk/src/main/java/org/jboss/ws/tools/ant/EclipseProjectTask.java 2008-04-28 12:53:20 UTC (rev 6720) +++ common/trunk/src/main/java/org/jboss/ws/tools/ant/EclipseProjectTask.java 2008-04-28 13:17:34 UTC (rev 6721) @@ -21,6 +21,8 @@ */ package org.jboss.ws.tools.ant; +// $Id$ + import java.io.BufferedWriter; import java.io.File; import java.io.FileWriter; Modified: common/trunk/src/main/java/org/jboss/ws/tools/ant/PathWriterTask.java =================================================================== --- common/trunk/src/main/java/org/jboss/ws/tools/ant/PathWriterTask.java 2008-04-28 12:53:20 UTC (rev 6720) +++ common/trunk/src/main/java/org/jboss/ws/tools/ant/PathWriterTask.java 2008-04-28 13:17:34 UTC (rev 6721) @@ -21,6 +21,8 @@ */ package org.jboss.ws.tools.ant; +// $Id$ + import java.io.BufferedWriter; import java.io.File; import java.io.FileWriter; Modified: common/trunk/src/main/java/org/jboss/wsf/common/KernelAwareSPIFactory.java =================================================================== --- common/trunk/src/main/java/org/jboss/wsf/common/KernelAwareSPIFactory.java 2008-04-28 12:53:20 UTC (rev 6720) +++ common/trunk/src/main/java/org/jboss/wsf/common/KernelAwareSPIFactory.java 2008-04-28 13:17:34 UTC (rev 6721) @@ -21,6 +21,8 @@ */ package org.jboss.wsf.common; +// $Id$ + import org.jboss.kernel.Kernel; import org.jboss.kernel.spi.registry.KernelRegistry; import org.jboss.kernel.spi.registry.KernelRegistryEntry; Modified: common/trunk/src/main/java/org/jboss/wsf/common/ObjectNameFactory.java =================================================================== --- common/trunk/src/main/java/org/jboss/wsf/common/ObjectNameFactory.java 2008-04-28 12:53:20 UTC (rev 6720) +++ common/trunk/src/main/java/org/jboss/wsf/common/ObjectNameFactory.java 2008-04-28 13:17:34 UTC (rev 6721) @@ -21,6 +21,8 @@ */ package org.jboss.wsf.common; +// $Id$ + import java.util.Hashtable; import javax.management.MalformedObjectNameException; Modified: common/trunk/src/main/java/org/jboss/wsf/common/ResourceLoaderAdapter.java =================================================================== --- common/trunk/src/main/java/org/jboss/wsf/common/ResourceLoaderAdapter.java 2008-04-28 12:53:20 UTC (rev 6720) +++ common/trunk/src/main/java/org/jboss/wsf/common/ResourceLoaderAdapter.java 2008-04-28 13:17:34 UTC (rev 6721) @@ -30,7 +30,6 @@ import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; - /** * The default file adapter loads resources through an associated classloader. * If no classload is set, the the thread context classloader will be used. Modified: common/trunk/src/main/java/org/jboss/wsf/common/URLLoaderAdapter.java =================================================================== --- common/trunk/src/main/java/org/jboss/wsf/common/URLLoaderAdapter.java 2008-04-28 12:53:20 UTC (rev 6720) +++ common/trunk/src/main/java/org/jboss/wsf/common/URLLoaderAdapter.java 2008-04-28 13:17:34 UTC (rev 6721) @@ -31,7 +31,6 @@ import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; - /** * Load resources through a URLClassLoader.<br> * NOTE: The associated classloader doesn't do parent delegation. Modified: common/trunk/src/main/java/org/jboss/wsf/common/handler/GenericLogicalHandler.java =================================================================== --- common/trunk/src/main/java/org/jboss/wsf/common/handler/GenericLogicalHandler.java 2008-04-28 12:53:20 UTC (rev 6720) +++ common/trunk/src/main/java/org/jboss/wsf/common/handler/GenericLogicalHandler.java 2008-04-28 13:17:34 UTC (rev 6721) @@ -26,8 +26,6 @@ import javax.xml.ws.handler.LogicalHandler; import javax.xml.ws.handler.LogicalMessageContext; - - /** * A generic jaxws logical handler * Modified: common/trunk/src/main/java/org/jboss/wsf/common/handler/GenericSOAPHandler.java =================================================================== --- common/trunk/src/main/java/org/jboss/wsf/common/handler/GenericSOAPHandler.java 2008-04-28 12:53:20 UTC (rev 6720) +++ common/trunk/src/main/java/org/jboss/wsf/common/handler/GenericSOAPHandler.java 2008-04-28 13:17:34 UTC (rev 6721) @@ -30,7 +30,6 @@ import javax.xml.ws.handler.LogicalMessageContext; import javax.xml.ws.handler.soap.SOAPHandler; - /** * A generic jaxws soap handler * Modified: common/trunk/src/main/java/org/jboss/wsf/common/logging/JDKLogRedirector.java =================================================================== --- common/trunk/src/main/java/org/jboss/wsf/common/logging/JDKLogRedirector.java 2008-04-28 12:53:20 UTC (rev 6720) +++ common/trunk/src/main/java/org/jboss/wsf/common/logging/JDKLogRedirector.java 2008-04-28 13:17:34 UTC (rev 6721) @@ -21,6 +21,8 @@ */ package org.jboss.wsf.common.logging; +// $Id$ + import java.util.LinkedList; import java.util.List; import java.util.logging.ConsoleHandler; Modified: common/trunk/src/main/java/org/jboss/wsf/common/management/AbstractServerConfigMBean.java =================================================================== --- common/trunk/src/main/java/org/jboss/wsf/common/management/AbstractServerConfigMBean.java 2008-04-28 12:53:20 UTC (rev 6720) +++ common/trunk/src/main/java/org/jboss/wsf/common/management/AbstractServerConfigMBean.java 2008-04-28 13:17:34 UTC (rev 6721) @@ -21,6 +21,8 @@ */ package org.jboss.wsf.common.management; +//$Id$ + import javax.management.ObjectName; import org.jboss.wsf.common.ObjectNameFactory; Modified: common/trunk/src/main/java/org/jboss/wsf/common/utils/UUIDGenerator.java =================================================================== --- common/trunk/src/main/java/org/jboss/wsf/common/utils/UUIDGenerator.java 2008-04-28 12:53:20 UTC (rev 6720) +++ common/trunk/src/main/java/org/jboss/wsf/common/utils/UUIDGenerator.java 2008-04-28 13:17:34 UTC (rev 6721) @@ -21,6 +21,8 @@ */ package org.jboss.wsf.common.utils; +//$Id$ + import java.security.SecureRandom; /** @@ -118,4 +120,4 @@ return string; } -} \ No newline at end of file +} Modified: common/trunk/src/main/java/org/jboss/wsf/test/GenericHandler.java =================================================================== --- common/trunk/src/main/java/org/jboss/wsf/test/GenericHandler.java 2008-04-28 12:53:20 UTC (rev 6720) +++ common/trunk/src/main/java/org/jboss/wsf/test/GenericHandler.java 2008-04-28 13:17:34 UTC (rev 6721) @@ -21,6 +21,8 @@ */ package org.jboss.wsf.test; +// $Id$ + import javax.xml.ws.handler.Handler; import javax.xml.ws.handler.MessageContext; Modified: common/trunk/src/main/java/org/jboss/wsf/test/GenericLogicalHandler.java =================================================================== --- common/trunk/src/main/java/org/jboss/wsf/test/GenericLogicalHandler.java 2008-04-28 12:53:20 UTC (rev 6720) +++ common/trunk/src/main/java/org/jboss/wsf/test/GenericLogicalHandler.java 2008-04-28 13:17:34 UTC (rev 6721) @@ -21,6 +21,8 @@ */ package org.jboss.wsf.test; +// $Id$ + import javax.xml.ws.handler.LogicalMessageContext; import javax.xml.ws.handler.LogicalHandler; Modified: common/trunk/src/main/java/org/jboss/wsf/test/GenericSOAPHandler.java =================================================================== --- common/trunk/src/main/java/org/jboss/wsf/test/GenericSOAPHandler.java 2008-04-28 12:53:20 UTC (rev 6720) +++ common/trunk/src/main/java/org/jboss/wsf/test/GenericSOAPHandler.java 2008-04-28 13:17:34 UTC (rev 6721) @@ -21,6 +21,8 @@ */ package org.jboss.wsf.test; +// $Id$ + import javax.xml.ws.handler.LogicalMessageContext; import javax.xml.ws.handler.soap.SOAPHandler; import javax.xml.namespace.QName; Modified: common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java =================================================================== --- common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java 2008-04-28 12:53:20 UTC (rev 6720) +++ common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java 2008-04-28 13:17:34 UTC (rev 6721) @@ -21,6 +21,8 @@ */ package org.jboss.wsf.test; +// $Id$ + import java.io.File; import java.net.MalformedURLException; import java.net.URL; Modified: common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java =================================================================== --- common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2008-04-28 12:53:20 UTC (rev 6720) +++ common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2008-04-28 13:17:34 UTC (rev 6721) @@ -21,6 +21,8 @@ */ package org.jboss.wsf.test; +// $Id$ + import java.io.File; import java.net.URL; import java.util.Hashtable; Modified: common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java =================================================================== --- common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java 2008-04-28 12:53:20 UTC (rev 6720) +++ common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java 2008-04-28 13:17:34 UTC (rev 6721) @@ -21,6 +21,8 @@ */ package org.jboss.wsf.test; +// $Id$ + import java.io.File; import java.net.MalformedURLException; import java.net.URL; Modified: common/trunk/src/main/java/org/jboss/wsf/test/TestDeployer.java =================================================================== --- common/trunk/src/main/java/org/jboss/wsf/test/TestDeployer.java 2008-04-28 12:53:20 UTC (rev 6720) +++ common/trunk/src/main/java/org/jboss/wsf/test/TestDeployer.java 2008-04-28 13:17:34 UTC (rev 6721) @@ -21,6 +21,8 @@ */ package org.jboss.wsf.test; +// $Id$ + import java.net.URL; /** @@ -38,4 +40,4 @@ /** Undeploy the given archive */ void undeploy(URL archive) throws Exception; -} \ No newline at end of file +} Modified: common/trunk/src/main/java/org/jboss/wsf/test/TestDeployerJBoss.java =================================================================== --- common/trunk/src/main/java/org/jboss/wsf/test/TestDeployerJBoss.java 2008-04-28 12:53:20 UTC (rev 6720) +++ common/trunk/src/main/java/org/jboss/wsf/test/TestDeployerJBoss.java 2008-04-28 13:17:34 UTC (rev 6721) @@ -21,6 +21,8 @@ */ package org.jboss.wsf.test; +// $Id$ + import java.io.Serializable; import java.net.URL; import java.security.Principal;

17 years, 8 months

1
0
0 / 0

JBossWS SVN: r6720 - stack/cxf/trunk.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-04-28 08:53:20 -0400 (Mon, 28 Apr 2008) New Revision: 6720 Modified: stack/cxf/trunk/build.xml Log: Use jbossws.integration.target Modified: stack/cxf/trunk/build.xml =================================================================== --- stack/cxf/trunk/build.xml 2008-04-28 10:16:08 UTC (rev 6719) +++ stack/cxf/trunk/build.xml 2008-04-28 12:53:20 UTC (rev 6720) @@ -43,10 +43,10 @@ <property name="version.id" value="${project.version}"/> <echo message="version.id=${version.id}"/> - <echo message="deploy.target=${jbossws.deploy.target}"/> + <echo message="integration.target=${jbossws.integration.target}"/> - <fail message="jbossws.deploy.target not set" unless="jbossws.deploy.target"/> - <property name="deploy.structure" value="${stack.output.dir}/deploy-${jbossws.deploy.target}"/> + <fail message="jbossws.integration.target not set" unless="jbossws.integration.target"/> + <property name="deploy.structure" value="${stack.output.dir}/deploy-${jbossws.integration.target}"/> </target>

17 years, 8 months

1
0
0 / 0

JBossWS SVN: r6719 - in framework/trunk/hudson/hudson-home/jobs: Maven-Repository-Clean and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2008-04-28 06:16:08 -0400 (Mon, 28 Apr 2008) New Revision: 6719 Added: framework/trunk/hudson/hudson-home/jobs/Maven-Repository-Clean/ framework/trunk/hudson/hudson-home/jobs/Maven-Repository-Clean/config.xml Modified: framework/trunk/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml Log: always clean user local maven repository - ensures all dependency artifacts are available from public repositories Added: framework/trunk/hudson/hudson-home/jobs/Maven-Repository-Clean/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Maven-Repository-Clean/config.xml (rev 0) +++ framework/trunk/hudson/hudson-home/jobs/Maven-Repository-Clean/config.xml 2008-04-28 10:16:08 UTC (rev 6719) @@ -0,0 +1,38 @@ +<?xml version='1.0' encoding='UTF-8'?> +<project> + <builders class="vector"> + <hudson.tasks.Shell> + <command> +# +# Module settings +# +MODULE=Maven-Repository-Clean + +USER=`whoami` + +rm -rf /home/$USER/.m2/repository/ +</command> + </hudson.tasks.Shell> + </builders> + <publishers class="vector"> + <hudson.tasks.Mailer> + <recipients>@hudson.mail.recipients@</recipients> + <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> + <sendToIndividuals>true</sendToIndividuals> + </hudson.tasks.Mailer> + </publishers> + <buildWrappers class="vector"/> + <scm class="hudson.scm.NullSCM"/> + <canRoam>true</canRoam> + <disabled>false</disabled> + <enableRemoteTrigger>false</enableRemoteTrigger> + <triggers class="vector"/> + <logRotator> + <daysToKeep>-1</daysToKeep> + <numToKeep>20</numToKeep> + </logRotator> + <keepDependencies>false</keepDependencies> + <properties/> + <description>Deletes user local maven repository</description> + <actions class="vector"/> +</project> Property changes on: framework/trunk/hudson/hudson-home/jobs/Maven-Repository-Clean/config.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: framework/trunk/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml 2008-04-28 10:15:17 UTC (rev 6718) +++ framework/trunk/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml 2008-04-28 10:16:08 UTC (rev 6719) @@ -3,7 +3,7 @@ <builders class="vector"/> <publishers class="vector"> <hudson.tasks.BuildTrigger> - <childProjects>AS-4.2.1, AS-4.2.2, AS-4.2.3, AS-5.0.0, AS-5.0.1</childProjects> + <childProjects>Maven-Repository-Clean, AS-4.2.1, AS-4.2.2, AS-4.2.3, AS-5.0.0, AS-5.0.1</childProjects> </hudson.tasks.BuildTrigger> </publishers> <buildWrappers class="vector"/>

17 years, 8 months

1
0
0 / 0

JBossWS SVN: r6718 - stack/cxf/trunk.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-04-28 06:15:17 -0400 (Mon, 28 Apr 2008) New Revision: 6718 Modified: stack/cxf/trunk/ Log: ignore target.properties Property changes on: stack/cxf/trunk ___________________________________________________________________ Name: svn:ignore - ant.properties clipboard.* target .settings profiles.xml + ant.properties clipboard.* target .settings profiles.xml target.properties

17 years, 8 months

1
0
0 / 0

JBossWS SVN: r6717 - in stack/cxf/trunk: src/main/distro and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-04-28 06:11:01 -0400 (Mon, 28 Apr 2008) New Revision: 6717 Modified: stack/cxf/trunk/build.xml stack/cxf/trunk/src/main/distro/ant.properties 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-bin-dist.xml Log: More work on bin-dist Modified: stack/cxf/trunk/build.xml =================================================================== --- stack/cxf/trunk/build.xml 2008-04-28 10:08:20 UTC (rev 6716) +++ stack/cxf/trunk/build.xml 2008-04-28 10:11:01 UTC (rev 6717) @@ -32,6 +32,7 @@ <import file="${stack.distro.dir}/jbossws-deploy-macros.xml"/> <property name="jbossws.default.deploy.conf" value="${stack.distro.dir}/jbossws-default-deploy.conf"/> + <property name="target.properties.file" value="${basedir}/target.properties"/>   @@ -42,24 +43,10 @@ <property name="version.id" value="${project.version}"/> <echo message="version.id=${version.id}"/> - <echo message="jbossid=${jbossws.integration.target}"/> + <echo message="deploy.target=${jbossws.deploy.target}"/> - <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}"/> + <fail message="jbossws.deploy.target not set" unless="jbossws.deploy.target"/> + <property name="deploy.structure" value="${stack.output.dir}/deploy-${jbossws.deploy.target}"/> </target>  Modified: stack/cxf/trunk/src/main/distro/ant.properties =================================================================== --- stack/cxf/trunk/src/main/distro/ant.properties 2008-04-28 10:08:20 UTC (rev 6716) +++ stack/cxf/trunk/src/main/distro/ant.properties 2008-04-28 10:11:01 UTC (rev 6717) @@ -9,9 +9,6 @@ jboss500.home=(a)jboss500.home@ jboss501.home=(a)jboss501.home@ -# The JBoss server under test. This can be [jboss422|jboss423|jboss500|jboss501] -jbossws.integration.target=jboss422 - # The JBoss settings jboss.server.instance=default jboss.bind.address=localhost Modified: stack/cxf/trunk/src/main/distro/build-deploy.xml =================================================================== --- stack/cxf/trunk/src/main/distro/build-deploy.xml 2008-04-28 10:08:20 UTC (rev 6716) +++ stack/cxf/trunk/src/main/distro/build-deploy.xml 2008-04-28 10:11:01 UTC (rev 6717) @@ -33,6 +33,7 @@ <target name="target-jboss422"> <property name="jbossws.integration.target" value="jboss422"/> + <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/> </target> <target name="deploy-jboss422" depends="undeploy-jboss422,deploy-structure-jboss42" description="Deploy jbossws to jboss422"> @@ -54,6 +55,7 @@ <target name="target-jboss423"> <property name="jbossws.integration.target" value="jboss423"/> + <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/> </target> <target name="deploy-jboss423" depends="undeploy-jboss423,deploy-structure-jboss42" description="Deploy jbossws to jboss423"> @@ -89,6 +91,7 @@ <target name="target-jboss500"> <property name="jbossws.integration.target" value="jboss500"/> + <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/> </target> <target name="deploy-jboss500" depends="undeploy-jboss500,deploy-structure-jboss50" description="Deploy jbossws to jboss500"> @@ -102,7 +105,6 @@ <target name="undeploy-jboss500" depends="target-jboss500,init" 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}"/> - <macro-undeploy-deployer targetdir="${jboss500.server.deploy}/jbossws.sar"/> </target>  @@ -111,6 +113,7 @@ <target name="target-jboss501"> <property name="jbossws.integration.target" value="jboss501"/> + <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/> </target> <target name="deploy-jboss501" depends="undeploy-jboss501,deploy-structure-jboss50" description="Deploy jbossws to jboss501"> @@ -124,7 +127,6 @@ <target name="undeploy-jboss501" depends="target-jboss501,init" 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}"/> - <macro-undeploy-deployer targetdir="${jboss501.server.deploy}/jbossws.sar"/> </target>  Modified: stack/cxf/trunk/src/main/distro/build-setup.xml =================================================================== --- stack/cxf/trunk/src/main/distro/build-setup.xml 2008-04-28 10:08:20 UTC (rev 6716) +++ stack/cxf/trunk/src/main/distro/build-setup.xml 2008-04-28 10:11:01 UTC (rev 6717) @@ -63,6 +63,10 @@  <target name="prepare"> + +  + <property file="${target.properties.file}"/> + <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-28 10:08:20 UTC (rev 6716) +++ stack/cxf/trunk/src/main/distro/build.xml 2008-04-28 10:11:01 UTC (rev 6717) @@ -26,24 +26,21 @@ <property name="deploy.artifacts.dir" value="${basedir}/deploy"/> <property name="jbossws.default.deploy.conf" value="${build.dir}/jbossws-default-deploy.conf"/> + <property name="target.properties.file" value="${basedir}/target.properties"/> <import file="${build.dir}/build-setup.xml"/> <import file="${build.dir}/build-deploy.xml"/> <import file="${build.dir}/jbossws-deploy-macros.xml"/> <import file="${tests.dir}/ant-import/build-testsuite.xml"/> -  - <property name="excludesfile" value="${tests.dir}/resources/test-excludes-${jbossws.integration.target}.txt"/> -    <target name="init" depends="prepare"> - <echo message="jbossid=${jbossws.integration.target}"/> - <fail message="jbossws.integration.target not set" unless="jbossws.integration.target"/> + <echo message="integration.target=${jbossws.integration.target}"/> <condition property="jbossws.integration.jboss42" value="true"> <or> @@ -59,6 +56,7 @@ </condition> <property name="deploy.structure" value="${output.dir}/deploy-${jbossws.integration.target}"/> + <property name="excludesfile" value="${tests.dir}/resources/test-excludes-${jbossws.integration.target}.txt"/> </target> <target name="tests-init" depends="init,tests-classpath"> Modified: stack/cxf/trunk/src/main/distro/jbossws-deploy-macros.xml =================================================================== --- stack/cxf/trunk/src/main/distro/jbossws-deploy-macros.xml 2008-04-28 10:08:20 UTC (rev 6716) +++ stack/cxf/trunk/src/main/distro/jbossws-deploy-macros.xml 2008-04-28 10:11:01 UTC (rev 6717) @@ -359,8 +359,8 @@  <delete> - <fileset dir="${jboss.server.home}/lib"> - <include name="jbossws-jboss*.jar"/> + <fileset dir="${jboss.server.home}"> + <include name="**/jbossws-jboss*.jar"/> </fileset> <fileset dir="${jboss.home}/client"> <include name="jbossws-jboss*.jar"/> @@ -378,16 +378,4 @@ </sequential> </macrodef> - <macrodef name="macro-undeploy-deployer"> - <attribute name="targetdir"/> - <sequential> - <property name="jboss.server.home" value="@{targetdir}/../.."/> - <delete> - <fileset dir="${jboss.server.home}/deployers/jbossws.deployer"> - <include name="jbossws-jboss*.jar"/> - </fileset> - </delete> - </sequential> - </macrodef> - </project> \ No newline at end of file Modified: stack/cxf/trunk/src/main/scripts/assembly-bin-dist.xml =================================================================== --- stack/cxf/trunk/src/main/scripts/assembly-bin-dist.xml 2008-04-28 10:08:20 UTC (rev 6716) +++ stack/cxf/trunk/src/main/scripts/assembly-bin-dist.xml 2008-04-28 10:11:01 UTC (rev 6717) @@ -67,6 +67,7 @@ <dependencySet> <outputDirectory>tests</outputDirectory> <useStrictFiltering>true</useStrictFiltering> + <scope>provided</scope> <unpack>true</unpack> <includes> <include>*:jbossws-framework:zip:testsuite</include>

17 years, 8 months

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