[jbossws-commits] JBossWS SVN: r9065 - in legacy/branches/jbossws-1.2.1.GA_CP: build/ant-import and 5 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Tue Jan 20 05:41:22 EST 2009
Author: alessio.soldano at jboss.com
Date: 2009-01-20 05:41:22 -0500 (Tue, 20 Jan 2009)
New Revision: 9065
Modified:
legacy/branches/jbossws-1.2.1.GA_CP/build/ant-import/build-deploy.xml
legacy/branches/jbossws-1.2.1.GA_CP/build/ant-import/build-release.xml
legacy/branches/jbossws-1.2.1.GA_CP/build/ant-import/build-samples.xml
legacy/branches/jbossws-1.2.1.GA_CP/build/ant-import/build-setup.xml
legacy/branches/jbossws-1.2.1.GA_CP/build/ant-import/build-thirdparty.xml
legacy/branches/jbossws-1.2.1.GA_CP/build/ant.properties.example
legacy/branches/jbossws-1.2.1.GA_CP/build/build.xml
legacy/branches/jbossws-1.2.1.GA_CP/build/hudson/hudson-home/config.xml
legacy/branches/jbossws-1.2.1.GA_CP/build/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml
legacy/branches/jbossws-1.2.1.GA_CP/build/hudson/hudson-home/jobs/Release-Matrix-Step2/config.xml
legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/resources/samples/build.xml
legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/build.xml
Log:
[JBPAPP-1634] Updating builds
Modified: legacy/branches/jbossws-1.2.1.GA_CP/build/ant-import/build-deploy.xml
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_CP/build/ant-import/build-deploy.xml 2009-01-20 10:40:16 UTC (rev 9064)
+++ legacy/branches/jbossws-1.2.1.GA_CP/build/ant-import/build-deploy.xml 2009-01-20 10:41:22 UTC (rev 9065)
@@ -18,74 +18,15 @@
<property name="build.etc.dir" value="install/etc"/>
<property name="core.output.lib.dir" value="install/jbossws-core"/>
- <property name="jboss40.output.lib.dir" value="install/integration-jboss40"/>
<property name="jboss42.output.lib.dir" value="install/integration-jboss42"/>
- <property name="jboss50.output.lib.dir" value="install/integration-jboss50"/>
- <property name="tomcat.output.lib.dir" value="install/integration-tomcat"/>
- <property name="tomcat.resources.dir" value="install/integration-tomcat"/>
<property name="thirdparty.dir" value="install/thirdparty"/>
- <property name="jboss50.available.file" value="${jboss50.home}/client/jboss-ejb3-client.jar"/>
<property name="jboss42.available.file" value="${jboss42.home}/client/jboss-client.jar"/>
- <property name="jboss40.available.file" value="${jboss40.home}/client/jboss-client.jar"/>
- <property name="tomcat.available.file" value="${tomcat.home}/server/lib/catalina.jar"/>
- <available property="jboss50.available" file="${jboss50.available.file}"/>
<available property="jboss42.available" file="${jboss42.available.file}"/>
- <available property="jboss40.available" file="${jboss40.available.file}"/>
- <available property="tomcat.available" file="${tomcat.available.file}"/>
</target>
<!-- ================================================================== -->
- <!-- Deployment JBoss50 -->
- <!-- ================================================================== -->
-
- <!-- Deploy jbossws to jboss50 -->
- <target name="deploy-jboss50" depends="prepare" description="Deploy jbossws">
-
- <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/>
-
- <copy todir="${jboss50.home}/bin" overwrite="true">
- <fileset dir="${build.etc.dir}">
- <include name="*.bat"/>
- <include name="*.sh"/>
- </fileset>
- </copy>
- <copy todir="${jboss50.home}/client" overwrite="true">
- <fileset dir="${core.output.lib.dir}">
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-saaj.jar"/>
- <include name="jbossws-client.jar"/>
- </fileset>
- <fileset dir="${thirdparty.dir}">
- <include name="jaxb-api.jar"/>
- <include name="jaxb-impl.jar"/>
- <include name="jaxb-xjc.jar"/>
- <include name="wsdl4j.jar"/>
- <include name="jbossws-wsconsume-impl.jar"/>
- </fileset>
- </copy>
- <copy todir="${jboss50.home}/server/${jboss.server.instance}/lib" overwrite="true">
- <fileset dir="${core.output.lib.dir}">
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-saaj.jar"/>
- </fileset>
- </copy>
- <delete dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/>
- <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/>
- <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer" src="${jboss50.output.lib.dir}/jbossws50-deployer.zip"/>
- <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="${jboss50.output.lib.dir}/jbossws50.sar"/>
- <!-- Deploy juddi-service.sar -->
- <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
- <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
- <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="${thirdparty.dir}/juddi-service.sar"/>
- </target>
-
- <!-- ================================================================== -->
<!-- Deployment JBoss42 -->
<!-- ================================================================== -->
@@ -131,154 +72,4 @@
<unzip dest="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="${thirdparty.dir}/juddi-service.sar"/>
</target>
- <!-- ================================================================== -->
- <!-- Deployment JBoss40 -->
- <!-- ================================================================== -->
-
- <!-- Deploy jbossws to jboss40 -->
- <target name="deploy-jboss40" depends="prepare" description="Deploy jbossws">
-
- <fail message="Not available: ${jboss40.available.file}" unless="jboss40.available"/>
-
- <copy todir="${jboss40.home}/bin" overwrite="true">
- <fileset dir="${build.etc.dir}">
- <include name="*.bat" />
- <include name="*.sh" />
- </fileset>
- </copy>
- <delete file="${jboss40.home}/client/jbossws14-client.jar" />
- <copy todir="${jboss40.home}/client" overwrite="true">
- <fileset dir="${core.output.lib.dir}">
- <include name="jboss-jaxrpc.jar" />
- <include name="jboss-jaxws.jar" />
- <include name="jboss-saaj.jar" />
- <include name="jbossws-client.jar" />
- </fileset>
- <!-- Only available on jdk1.5 -->
- <fileset dir="${thirdparty.dir}">
- <include name="jaxb-api.jar" />
- <include name="jaxb-impl.jar" />
- <include name="jaxb-xjc.jar" />
- <include name="jbossws-wsconsume-impl.jar" />
- <include name="stax-api.jar"/>
- <include name="wstx.jar"/>
- </fileset>
- </copy>
- <copy todir="${jboss40.home}/server/${jboss.server.instance}/lib" overwrite="true">
- <fileset dir="${core.output.lib.dir}">
- <include name="jboss-jaxrpc.jar" />
- <include name="jboss-jaxws.jar" />
- <include name="jboss-saaj.jar" />
- </fileset>
- </copy>
- <delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws14.sar" />
- <delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar" />
- <mkdir dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar" />
- <unjar dest="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="${jboss40.output.lib.dir}/jbossws40.sar" />
- <!-- Copy jboss-xml-binding.jar -->
- <copy todir="${jboss40.home}/client" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true" />
- <copy todir="${jboss40.home}/lib" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true" />
- <!-- Deploy juddi-service.sar -->
- <delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" />
- <mkdir dir="${jboss40.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" />
- <unzip dest="${jboss40.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="${thirdparty.dir}/juddi-service.sar" />
- </target>
-
- <!-- Deploy jbossws to jboss40 jdk1.4 -->
- <target name="deploy-jboss40-jdk14" depends="prepare" description="Deploy jbossws">
-
- <fail message="Not available: ${jboss40.available.file}" unless="jboss40.available"/>
-
- <copy todir="${jboss40.home}/bin" overwrite="true">
- <fileset dir="${build.etc.dir}">
- <include name="*.bat" />
- <include name="*.sh" />
- </fileset>
- </copy>
- <delete file="${jboss40.home}/client/jbossws-client.jar" />
- <copy todir="${jboss40.home}/client" overwrite="true">
- <fileset dir="${core.output.lib.dir}">
- <include name="jboss-jaxrpc.jar" />
- <include name="jboss-saaj.jar" />
- </fileset>
- <fileset dir="${jboss40.output.lib.dir}">
- <include name="jbossws14-client.jar" />
- </fileset>
- </copy>
- <delete file="${jboss40.home}/server/${jboss.server.instance}/lib/jboss-jaxws.jar" />
- <copy todir="${jboss40.home}/server/${jboss.server.instance}/lib" overwrite="true">
- <fileset dir="${core.output.lib.dir}">
- <include name="jboss-jaxrpc.jar" />
- <include name="jboss-saaj.jar" />
- </fileset>
- <fileset dir="${jboss40.output.lib.dir}">
- <include name="jboss-jaxws14.jar" />
- </fileset>
- </copy>
- <delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar" />
- <delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws14.sar" />
- <mkdir dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws14.sar" />
- <unjar dest="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws14.sar" src="${jboss40.output.lib.dir}/jbossws40-jdk14.sar" />
- <!-- Copy jboss-xml-binding.jar -->
- <copy todir="${jboss40.home}/client" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true" />
- <copy todir="${jboss40.home}/lib" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true" />
- <!-- Deploy juddi-service.sar -->
- <delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" />
- <mkdir dir="${jboss40.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" />
- <unzip dest="${jboss40.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="${thirdparty.dir}/juddi-service.sar" />
- </target>
-
- <!-- ================================================================== -->
- <!-- Deployment Tomcat -->
- <!-- ================================================================== -->
-
- <!-- Deploy to Tomcat -->
- <target name="deploy-tomcat" depends="prepare" description="Deploy to Tomcat">
-
- <fail message="Not available: ${tomcat.available.file}" unless="tomcat.available"/>
-
- <property name="tomcat.conf.dir" value="${tomcat.home}/conf"/>
- <property name="tomcat.common.dir" value="${tomcat.home}/common"/>
- <property name="tomcat.common.classes" value="${tomcat.home}/common/classes"/>
- <property name="tomcat.common.lib" value="${tomcat.home}/common/lib"/>
- <property name="tomcat.webapps.dir" value="${tomcat.home}/webapps"/>
-
- <copy todir="${tomcat.common.dir}/endorsed">
- <fileset dir="${thirdparty.dir}">
- <include name="serializer.jar"/>
- <include name="xalan.jar"/>
- <include name="xercesImpl.jar"/>
- </fileset>
- </copy>
- <copy todir="${tomcat.conf.dir}" overwrite="true">
- <fileset dir="${tomcat.resources.dir}">
- <include name="tomcat-users.xml"/>
- </fileset>
- </copy>
- <copy todir="${tomcat.common.classes}" overwrite="true">
- <fileset dir="${tomcat.resources.dir}">
- <include name="log4j.xml"/>
- </fileset>
- </copy>
- <copy todir="${tomcat.common.lib}" overwrite="true">
- <fileset dir="${core.output.lib.dir}">
- <include name="jbossws-core.jar"/>
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-saaj.jar"/>
- </fileset>
- <fileset dir="${tomcat.output.lib.dir}">
- <include name="jbossws-tomcat-integration.jar"/>
- <include name="jbossws-thirdparty.jar"/>
- </fileset>
- <fileset dir="${thirdparty.dir}">
- <include name="activation.jar"/>
- <include name="log4j.jar"/>
- <include name="mail.jar"/>
- </fileset>
- </copy>
- <copy todir="${tomcat.webapps.dir}" file="${tomcat.output.lib.dir}/jbossws.war" overwrite="true"/>
- <delete dir="${tomcat.webapps.dir}/jbossws"/>
- </target>
-
</project>
Modified: legacy/branches/jbossws-1.2.1.GA_CP/build/ant-import/build-release.xml
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_CP/build/ant-import/build-release.xml 2009-01-20 10:40:16 UTC (rev 9064)
+++ legacy/branches/jbossws-1.2.1.GA_CP/build/ant-import/build-release.xml 2009-01-20 10:41:22 UTC (rev 9065)
@@ -39,7 +39,7 @@
</target>
<!-- Release to jboss.local.repository -->
- <target name="release-to-repository" depends="core-jars,jboss50-jars,jboss42-jars,jboss40-jars,jboss40-jars14"
+ <target name="release-to-repository" depends="core-jars,jboss42-jars"
description="Release to jboss.local.repository">
<!-- jboss/jbossws -->
@@ -62,21 +62,6 @@
</filterset>
</copy>
- <!-- jboss/jbossws-jboss50 -->
- <mkdir dir="${jboss.repository.dir}/jbossws-jboss50/${repository.id}/lib"/>
- <copy todir="${jboss.repository.dir}/jbossws-jboss50/${repository.id}/lib" overwrite="true">
- <fileset dir="${jboss50.output.lib.dir}">
- <include name="jbossws50.sar"/>
- <include name="jbossws50-deployer.zip"/>
- <include name="jbossws50-src.zip"/>
- </fileset>
- </copy>
- <copy tofile="${jboss.repository.dir}/jbossws-jboss50/${repository.id}/component-info.xml" file="${build.etc.dir}/component-info/jbossws-jboss50.xml" filtering="true" overwrite="true">
- <filterset>
- <filtersfile file="${build.dir}/version.properties"/>
- </filterset>
- </copy>
-
<!-- jboss/jbossws-jboss42 -->
<mkdir dir="${jboss.repository.dir}/jbossws-jboss42/${repository.id}/lib"/>
<copy todir="${jboss.repository.dir}/jbossws-jboss42/${repository.id}/lib" overwrite="true">
@@ -90,40 +75,6 @@
<filtersfile file="${build.dir}/version.properties"/>
</filterset>
</copy>
-
- <!-- jboss/jbossws-jboss40 -->
- <mkdir dir="${jboss.repository.dir}/jbossws-jboss40/${repository.id}/lib"/>
- <copy todir="${jboss.repository.dir}/jbossws-jboss40/${repository.id}/lib" overwrite="true">
- <fileset dir="${jboss40.output.lib.dir}">
- <include name="jbossws40.sar"/>
- <include name="jbossws40-src.zip"/>
- </fileset>
- </copy>
- <copy tofile="${jboss.repository.dir}/jbossws-jboss40/${repository.id}/component-info.xml" file="${build.etc.dir}/component-info/jbossws-jboss40.xml" filtering="true" overwrite="true">
- <filterset>
- <filtersfile file="${build.dir}/version.properties"/>
- </filterset>
- </copy>
-
- <!-- jbossws14 -->
- <mkdir dir="${jboss.repository.dir}/jbossws14/${repository.id}/lib"/>
- <copy todir="${jboss.repository.dir}/jbossws14/${repository.id}/lib" overwrite="true">
- <fileset dir="${core.output.lib.dir}">
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-saaj.jar"/>
- </fileset>
- <fileset dir="${jboss40.output.lib.dir}">
- <include name="jbossws40-jdk14.sar"/>
- <include name="jbossws14-client.jar"/>
- <include name="jboss-jaxws14.jar"/>
- </fileset>
- </copy>
- <copy tofile="${jboss.repository.dir}/jbossws14/${repository.id}/component-info.xml" file="${build.etc.dir}/component-info/jbossws14.xml" filtering="true" overwrite="true">
- <filterset>
- <filtersfile file="${build.dir}/version.properties"/>
- </filterset>
- </copy>
-
</target>
<!-- Release to portal content -->
@@ -157,24 +108,18 @@
<!-- ================================================================== -->
<!-- Build the bin dist -->
- <target name="build-bin-dist" depends="core-jars,jboss50-jars,jboss42-jars,jboss40-jars,jboss40-jars14,tomcat-jars,build-samples,build-javadoc"
+ <target name="build-bin-dist" depends="core-jars,jboss42-jars,build-samples,build-javadoc"
description="Build the binary distribution">
<property name="install.bin.dir" value="${build.bin.dist}/install/bin"/>
<property name="install.etc.dir" value="${build.bin.dist}/install/etc"/>
<property name="install.core.dir" value="${build.bin.dist}/install/jbossws-core"/>
- <property name="install.jboss40.dir" value="${build.bin.dist}/install/integration-jboss40"/>
<property name="install.jboss42.dir" value="${build.bin.dist}/install/integration-jboss42"/>
- <property name="install.jboss50.dir" value="${build.bin.dist}/install/integration-jboss50"/>
- <property name="install.tomcat.dir" value="${build.bin.dist}/install/integration-tomcat"/>
<property name="install.thirdparty.dir" value="${build.bin.dist}/install/thirdparty"/>
<mkdir dir="${install.etc.dir}"/>
<mkdir dir="${install.core.dir}"/>
- <mkdir dir="${install.jboss40.dir}"/>
<mkdir dir="${install.jboss42.dir}"/>
- <mkdir dir="${install.jboss50.dir}"/>
- <mkdir dir="${install.tomcat.dir}"/>
<mkdir dir="${install.thirdparty.dir}"/>
<copy todir="${build.bin.dist}" file="${build.etc.dir}/JBossORG-EULA.txt" overwrite="true"/>
@@ -234,29 +179,8 @@
</fileset>
</copy>
- <copy todir="${install.jboss50.dir}" file="${jboss50.output.lib.dir}/jbossws50.sar"/>
- <copy todir="${install.jboss50.dir}" file="${jboss50.output.lib.dir}/jbossws50-deployer.zip"/>
<copy todir="${install.jboss42.dir}" file="${jboss42.output.lib.dir}/jbossws42.sar"/>
- <copy todir="${install.jboss40.dir}">
- <fileset dir="${jboss40.output.lib.dir}">
- <include name="jbossws40.sar"/>
- <include name="jbossws40-jdk14.sar"/>
- <include name="jbossws14-client.jar"/>
- <include name="jboss-jaxws14.jar"/>
- </fileset>
- </copy>
- <!-- Install Tomcat -->
- <copy todir="${install.tomcat.dir}" overwrite="true">
- <fileset dir="${tomcat.output.lib.dir}">
- <include name="jbossws-tomcat-integration.jar"/>
- <include name="jbossws-thirdparty.jar"/>
- </fileset>
- </copy>
- <copy todir="${install.tomcat.dir}" overwrite="true">
- <fileset dir="${tomcat.output.lib.dir}" includes="jbossws.war"/>
- </copy>
-
<zip destfile="${build.output.dir}/jbossws-${version.id}.zip" basedir="${build.bin.dist}"/>
</target>
@@ -276,14 +200,8 @@
<include name="jbossws-tests/ant-import/**"/>
<include name="jbossws-tests/src/**"/>
<include name="jbossws-tests/build.xml"/>
- <include name="integration-jboss50/src/**"/>
- <include name="integration-jboss50/build.xml"/>
<include name="integration-jboss42/src/**"/>
<include name="integration-jboss42/build.xml"/>
- <include name="integration-jboss40/src/**"/>
- <include name="integration-jboss40/build.xml"/>
- <include name="integration-tomcat/src/**"/>
- <include name="integration-tomcat/build.xml"/>
</fileset>
</copy>
<zip destfile="${build.output.dir}/jbossws-src-${version.id}.zip" basedir="${build.src.dist}"
@@ -300,8 +218,6 @@
<javadoc destdir="${build.output.dir}/docs/api" author="true" version="true" use="true" windowtitle="JBossWS API">
<packageset dir="${core.java.dir}" defaultexcludes="yes"/>
<packageset dir="${jboss42.java.dir}" defaultexcludes="yes"/>
- <packageset dir="${jboss50.java.dir}" defaultexcludes="yes"/>
- <packageset dir="${tomcat.java.dir}" defaultexcludes="yes"/>
<classpath refid="core.classpath"/>
</javadoc>
<zip destfile="${build.output.dir}/jbossws-${version.id}-api.zip" basedir="${build.output.dir}/docs"
Modified: legacy/branches/jbossws-1.2.1.GA_CP/build/ant-import/build-samples.xml
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_CP/build/ant-import/build-samples.xml 2009-01-20 10:40:16 UTC (rev 9064)
+++ legacy/branches/jbossws-1.2.1.GA_CP/build/ant-import/build-samples.xml 2009-01-20 10:41:22 UTC (rev 9065)
@@ -16,7 +16,7 @@
<!--
| Build the samples
-->
- <target name="build-samples" description="Builds the samples." depends="core-jars,jboss50-jars,jboss42-jars,jboss40-jars,tomcat-jars">
+ <target name="build-samples" description="Builds the samples." depends="core-jars,jboss42-jars">
<property name="samples.target" value="jbossws-samples-${version.id}"/>
<property name="build.src.samples.dir" value="${build.output.dir}/${samples.target}"/>
@@ -73,18 +73,9 @@
<include name="jboss-jaxws.jar"/>
<include name="jboss-saaj.jar"/>
</fileset>
- <fileset dir="${jboss50.output.lib.dir}">
- <include name="jbossws-jboss50-integration.jar"/>
- </fileset>
<fileset dir="${jboss42.output.lib.dir}">
<include name="jbossws-jboss42-integration.jar"/>
</fileset>
- <fileset dir="${jboss40.output.lib.dir}">
- <include name="jbossws-jboss40-integration.jar"/>
- </fileset>
- <fileset dir="${tomcat.output.lib.dir}">
- <include name="jbossws-tomcat-integration.jar"/>
- </fileset>
</copy>
<!-- Build the samples zip -->
Modified: legacy/branches/jbossws-1.2.1.GA_CP/build/ant-import/build-setup.xml
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_CP/build/ant-import/build-setup.xml 2009-01-20 10:40:16 UTC (rev 9064)
+++ legacy/branches/jbossws-1.2.1.GA_CP/build/ant-import/build-setup.xml 2009-01-20 10:41:22 UTC (rev 9065)
@@ -24,53 +24,23 @@
<property name="build.dir" value="${basedir}/../build"/>
<property name="build.output.dir" value="${build.dir}/output"/>
<property name="docs.dir" value="${basedir}/../jbossws-docs"/>
- <property name="integration.jboss40.dir" value="${basedir}/../integration-jboss40"/>
<property name="integration.jboss42.dir" value="${basedir}/../integration-jboss42"/>
- <property name="integration.jboss50.dir" value="${basedir}/../integration-jboss50"/>
- <property name="integration.tomcat.dir" value="${basedir}/../integration-tomcat"/>
<property name="core.dir" value="${basedir}/../jbossws-core"/>
<property name="tests.dir" value="${basedir}/../jbossws-tests"/>
<property name="build.etc.dir" value="${build.dir}/output/etc"/>
<property name="thirdparty.dir" value="${build.dir}/thirdparty"/>
- <property name="jboss50.lib" value="${jboss50.home}/lib"/>
- <property name="jboss50.client" value="${jboss50.home}/client"/>
- <property name="jboss50.server" value="${jboss50.home}/server/${jboss.server.instance}"/>
- <property name="jboss50.server.lib" value="${jboss50.server}/lib"/>
- <property name="jboss50.server.deploy" value="${jboss50.server}/deploy"/>
- <property name="jboss50.server.deployers" value="${jboss50.server}/deployers"/>
- <property name="jboss50.thirdparty" value="${jboss50.home}/../../../thirdparty"/>
-
<property name="jboss42.lib" value="${jboss42.home}/lib"/>
<property name="jboss42.client" value="${jboss42.home}/client"/>
<property name="jboss42.server" value="${jboss42.home}/server/${jboss.server.instance}"/>
<property name="jboss42.server.lib" value="${jboss42.server}/lib"/>
<property name="jboss42.server.deploy" value="${jboss42.server}/deploy"/>
<property name="jboss42.thirdparty" value="${jboss42.home}/../../../thirdparty"/>
-
- <property name="jboss40.lib" value="${jboss40.home}/lib"/>
- <property name="jboss40.client" value="${jboss40.home}/client"/>
- <property name="jboss40.server" value="${jboss40.home}/server/${jboss.server.instance}"/>
- <property name="jboss40.server.lib" value="${jboss40.server}/lib"/>
- <property name="jboss40.server.deploy" value="${jboss40.server}/deploy"/>
- <property name="jboss40.thirdparty" value="${jboss40.home}/../../../thirdparty"/>
-
- <property name="tomcat.conf.dir" value="${tomcat.home}/conf"/>
- <property name="tomcat.common.dir" value="${tomcat.home}/common"/>
- <property name="tomcat.common.classes" value="${tomcat.home}/common/classes"/>
- <property name="tomcat.common.lib" value="${tomcat.home}/common/lib"/>
- <property name="tomcat.webapps.dir" value="${tomcat.home}/webapps"/>
- <property name="jboss50.available.file" value="${jboss50.client}/jboss-ejb3-client.jar"/>
<property name="jboss42.available.file" value="${jboss42.client}/jboss-client.jar"/>
- <property name="jboss40.available.file" value="${jboss40.client}/jboss-client.jar"/>
- <property name="tomcat.available.file" value="${tomcat.home}/server/lib/catalina.jar"/>
- <available property="jboss50.available" file="${jboss50.available.file}"/>
<available property="jboss42.available" file="${jboss42.available.file}"/>
- <available property="jboss40.available" file="${jboss40.available.file}"/>
- <available property="tomcat.available" file="${tomcat.available.file}"/>
<!-- JDK Detection -->
<available classname="java.lang.StackTraceElement" property="HAVE_JDK_1.4"/>
@@ -84,10 +54,7 @@
<mkdir dir="${build.output.dir}"/>
- <echo message="jboss50.home = ${jboss50.home}"/>
<echo message="jboss42.home = ${jboss42.home}"/>
- <echo message="jboss40.home = ${jboss40.home}"/>
- <echo message="tomcat.home = ${tomcat.home}"/>
<available property="jbossws.portal.content.available" file="${jbossws.portal.content}" type="dir"/>
Modified: legacy/branches/jbossws-1.2.1.GA_CP/build/ant-import/build-thirdparty.xml
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_CP/build/ant-import/build-thirdparty.xml 2009-01-20 10:40:16 UTC (rev 9064)
+++ legacy/branches/jbossws-1.2.1.GA_CP/build/ant-import/build-thirdparty.xml 2009-01-20 10:41:22 UTC (rev 9065)
@@ -114,23 +114,6 @@
<pathelement location="${thirdparty.dir}/xalan.jar"/>
</path>
- <!-- The compile classpath for jboss50 integration -->
- <path id="jboss50.integration.classpath">
- <pathelement location="${jboss50.lib}/jboss-aop-jdk50.jar"/>
- <pathelement location="${jboss50.lib}/jboss-deployers.jar"/>
- <pathelement location="${jboss50.lib}/jboss-j2se.jar"/>
- <pathelement location="${jboss50.lib}/jboss-system.jar"/>
- <pathelement location="${jboss50.lib}/jboss-system-jmx.jar"/>
- <pathelement location="${jboss50.lib}/jboss-vfs.jar"/>
- <pathelement location="${jboss50.server.lib}/jboss.jar"/>
- <pathelement location="${jboss50.server.lib}/jnpserver.jar"/>
- <pathelement location="${jboss50.server.deployers}/jboss-aop-jboss5.deployer/jboss-aspect-library-jdk50.jar"/>
- <pathelement location="${jboss50.server.deployers}/ejb3.deployer/jboss-annotations-ejb3.jar"/>
- <pathelement location="${jboss50.server.deployers}/ejb3.deployer/jboss-ejb3.jar"/>
- <pathelement location="${jboss50.server.deployers}/ejb3.deployer/jboss-ejb3x.jar"/>
- <path refid="core.classpath"/>
- </path>
-
<!-- The compile classpath for jboss42 integration -->
<path id="jboss42.integration.classpath">
<pathelement location="${jboss42.lib}/jboss-jmx.jar"/>
@@ -143,23 +126,6 @@
<path refid="core.classpath"/>
</path>
- <!-- The compile classpath for jboss40 integration -->
- <path id="jboss40.integration.classpath">
- <pathelement location="${jboss40.lib}/jboss-jmx.jar"/>
- <pathelement location="${jboss40.lib}/jboss-system.jar"/>
- <pathelement location="${jboss40.server.lib}/jboss.jar"/>
- <pathelement location="${jboss40.server.deploy}/jboss-aop-jdk50.deployer/jboss-aop-jdk50.jar"/>
- <pathelement location="${jboss40.server.deploy}/ejb3.deployer/jboss-annotations-ejb3.jar"/>
- <pathelement location="${jboss40.server.deploy}/ejb3.deployer/jboss-ejb3.jar"/>
- <pathelement location="${jboss40.server.deploy}/ejb3.deployer/jboss-ejb3x.jar"/>
- <path refid="core.classpath"/>
- </path>
-
- <!-- The compile classpath for tomcat integration -->
- <path id="tomcat.integration.classpath">
- <path refid="core.classpath"/>
- </path>
-
</target>
</project>
Modified: legacy/branches/jbossws-1.2.1.GA_CP/build/ant.properties.example
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_CP/build/ant.properties.example 2009-01-20 10:40:16 UTC (rev 9064)
+++ legacy/branches/jbossws-1.2.1.GA_CP/build/ant.properties.example 2009-01-20 10:41:22 UTC (rev 9065)
@@ -4,12 +4,10 @@
# $Id$
# Optional JBoss Home
-#jboss50.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta2
#jboss42.home=/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.CR2
-#jboss40.home=/home/tdiesler/svn/jbossas/branches/Branch_4_0/build/output/jboss-4.0.5.SP1-ejb3
-# The JBoss server under test. This can be [jboss50|jboss42|jboss40|tomcat]
-jbossws.integration.target=jboss50
+# The JBoss server under test. This could be [jboss50|jboss42|jboss40|tomcat]
+jbossws.integration.target=jboss42
# The JBoss server instance
jboss.server.instance=default
@@ -28,21 +26,12 @@
hudson.port=8180
hudson.jdk15=/usr/java/jdk1.5
-hudson.jdk14=/usr/java/jdk1.4
-hudson.jboss50.url=https://svn.jboss.org/repos/jbossas/trunk
-hudson.jboss50.build=jboss-5.0.0.Beta2
-hudson.jboss50.rev=62344
-
hudson.jboss42.url=https://svn.jboss.org/repos/jbossas/branches/Branch_4_2
hudson.jboss42.build=jboss-4.2.0.CR2
hudson.jboss42.rev=62316
-hudson.jboss40.url=https://svn.jboss.org/repos/jbossas/branches/Branch_4_0
-hudson.jboss40.build=jboss-4.0.5.SP1
-hudson.jboss40.rev=62321
-
-hudson.mail.recipients=thomas.diesler at jboss.com, heiko.braun at jboss.com, alejandro.guizar at jboss.com
+hudson.mail.recipients=alessio.soldano at jboss.com, richard.opalka at jboss.com, thomas.diesler at jboss.com, heiko.braun at jboss.com, alejandro.guizar at jboss.com
hudson.smtp.host=mail.navisite.com
# JBoss Repository
Modified: legacy/branches/jbossws-1.2.1.GA_CP/build/build.xml
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_CP/build/build.xml 2009-01-20 10:40:16 UTC (rev 9064)
+++ legacy/branches/jbossws-1.2.1.GA_CP/build/build.xml 2009-01-20 10:41:22 UTC (rev 9065)
@@ -18,10 +18,7 @@
<import file="${basedir}/ant-import/build-release.xml"/>
<import file="${basedir}/ant-import/build-samples.xml"/>
<import file="${basedir}/ant-import/build-hudson.xml"/>
- <import file="${basedir}/../integration-jboss40/build.xml"/>
<import file="${basedir}/../integration-jboss42/build.xml"/>
- <import file="${basedir}/../integration-jboss50/build.xml"/>
- <import file="${basedir}/../integration-tomcat/build.xml"/>
<import file="${basedir}/../jbossws-core/build.xml"/>
<import file="${basedir}/../jbossws-tests/build.xml"/>
@@ -44,10 +41,7 @@
<target name="clean" depends="prepare" description="Cleans up most generated files.">
<delete dir="${build.dir}/output"/>
<ant antfile="${core.dir}/build.xml" target="clean" inheritall="false"/>
- <ant antfile="${integration.jboss40.dir}/build.xml" target="clean" inheritall="false"/>
<ant antfile="${integration.jboss42.dir}/build.xml" target="clean" inheritall="false"/>
- <ant antfile="${integration.jboss50.dir}/build.xml" target="clean" inheritall="false"/>
- <ant antfile="${integration.tomcat.dir}/build.xml" target="clean" inheritall="false"/>
<!--ant antfile="${tests.dir}/build.xml" target="clean" inheritall="false"/-->
</target>
Modified: legacy/branches/jbossws-1.2.1.GA_CP/build/hudson/hudson-home/config.xml
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_CP/build/hudson/hudson-home/config.xml 2009-01-20 10:40:16 UTC (rev 9064)
+++ legacy/branches/jbossws-1.2.1.GA_CP/build/hudson/hudson-home/config.xml 2009-01-20 10:41:22 UTC (rev 9065)
@@ -15,11 +15,7 @@
<p/>
<table>
- <tr><th align=left>@hudson.jboss50.build@</th><td>-r at hudson.jboss50.rev@ @hudson.jboss50.url@</td></tr>
<tr><th align=left>@hudson.jboss42.build@</th><td>-r at hudson.jboss42.rev@ @hudson.jboss42.url@</td></tr>
- <tr><th align=left>@hudson.jboss40.build at -ejb3</th><td>-r at hudson.jboss40.rev@ @hudson.jboss40.url@</td></tr>
- <tr><th align=left>jboss-4.0.5.GA-ejb3</th><td>https://svn.jboss.org/repos/jbossas/tags/JBoss_4_0_5_GA</td></tr>
- <tr><th align=left>apache-tomcat- at apache-tomcat@</th></tr>
</table>
]]>
</systemMessage>
@@ -33,10 +29,7 @@
<owner reference="../../.."/>
<jobNames class="tree-set">
<no-comparator/>
- <string>JBAS-Tests-AS-4.0</string>
- <string>JBAS-Tests-AS-4.0-jdk14</string>
<string>JBAS-Tests-AS-4.2</string>
- <string>JBAS-Tests-AS-5.0</string>
</jobNames>
<name>JBossAS Testsuite</name>
<description>
@@ -74,13 +67,7 @@
<owner reference="../../.."/>
<jobNames class="tree-set">
<no-comparator/>
- <string>JBWS-Tests-AS-4.0.5</string>
- <string>JBWS-Tests-AS-4.0.5-jdk14</string>
- <string>JBWS-Tests-AS-4.0</string>
- <string>JBWS-Tests-AS-4.0-jdk14</string>
<string>JBWS-Tests-AS-4.2</string>
- <string>JBWS-Tests-AS-5.0</string>
- <string>JBWS-Tests-TC-5.5</string>
</jobNames>
<name>JBossWS Testsuite</name>
<description>
@@ -97,11 +84,7 @@
<owner reference="../../.."/>
<jobNames class="tree-set">
<no-comparator/>
- <string>JBWS-Samples-AS-4.0.5</string>
- <string>JBWS-Samples-AS-4.0</string>
<string>JBWS-Samples-AS-4.2</string>
- <string>JBWS-Samples-AS-5.0</string>
- <string>JBWS-Samples-TC-5.5</string>
</jobNames>
<name>JBossWS Samples</name>
<description>
@@ -128,13 +111,7 @@
<p/>
<table border=1>
<tr><th> </th><th>JBWS-Tests</th><th>JBAS-Tests</th><th>JBWS-Samples</th></tr>
-<tr align=center><th align=left>AS-5.0</th><td>ok</td><td>ok</td><td>ok</td></tr>
<tr align=center><th align=left>AS-4.2</th><td>ok</td><td>ok</td><td>ok</td></tr>
-<tr align=center><th align=left>AS-4.0</th><td>ok</td><td>ok</td><td>ok</td></tr>
-<tr align=center><th align=left>AS-4.0-jdk14</th><td>ok</td><td>ok</td><td>N/A</td></tr>
-<tr align=center><th align=left>AS-4.0.5</th><td>ok</td><td>ok</td><td>ok</td></tr>
-<tr align=center><th align=left>AS-4.0.5-jdk14</th><td>ok</td><td>ok</td><td>N/A</td></tr>
-<tr align=center><th align=left>TC-5.5</th><td>ok</td><td>N/A</td><td>ok</td></tr>
</table>
]]>
</description>
@@ -145,13 +122,7 @@
<owner reference="../../.."/>
<jobNames class="tree-set">
<no-comparator/>
- <string>AS-5.0</string>
<string>AS-4.2</string>
- <string>AS-4.0</string>
- <string>AS-4.0-jdk14</string>
- <string>AS-4.0.5</string>
- <string>AS-4.0.5-jdk14</string>
- <string>TC-5.5</string>
</jobNames>
<name>Target Container</name>
<description>
Modified: legacy/branches/jbossws-1.2.1.GA_CP/build/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_CP/build/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml 2009-01-20 10:40:16 UTC (rev 9064)
+++ legacy/branches/jbossws-1.2.1.GA_CP/build/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml 2009-01-20 10:41:22 UTC (rev 9065)
@@ -3,7 +3,7 @@
<builders class="vector"/>
<publishers class="vector">
<hudson.tasks.BuildTrigger>
- <childProjects>AS-5.0, AS-4.2, AS-4.0, AS-4.0-jdk14, AS-4.0.5, AS-4.0.5-jdk14, TC-5.5</childProjects>
+ <childProjects>AS-4.2</childProjects>
</hudson.tasks.BuildTrigger>
</publishers>
<buildWrappers class="vector"/>
Modified: legacy/branches/jbossws-1.2.1.GA_CP/build/hudson/hudson-home/jobs/Release-Matrix-Step2/config.xml
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_CP/build/hudson/hudson-home/jobs/Release-Matrix-Step2/config.xml 2009-01-20 10:40:16 UTC (rev 9064)
+++ legacy/branches/jbossws-1.2.1.GA_CP/build/hudson/hudson-home/jobs/Release-Matrix-Step2/config.xml 2009-01-20 10:41:22 UTC (rev 9065)
@@ -3,7 +3,7 @@
<builders class="vector"/>
<publishers class="vector">
<hudson.tasks.BuildTrigger>
- <childProjects>JBWS-Tests-AS-5.0, JBWS-Tests-AS-4.2, JBWS-Tests-AS-4.0, JBWS-Tests-AS-4.0-jdk14, JBWS-Tests-AS-4.0.5, JBWS-Tests-AS-4.0.5-jdk14, JBWS-Tests-TC-5.5, JBAS-Tests-AS-5.0, JBAS-Tests-AS-4.2, JBAS-Tests-AS-4.0, JBAS-Tests-AS-4.0-jdk14, JBWS-Samples-AS-5.0, JBWS-Samples-AS-4.2, JBWS-Samples-AS-4.0, JBWS-Samples-AS-4.0.5, JBWS-Samples-TC-5.5</childProjects>
+ <childProjects>JBWS-Tests-AS-4.2, JBAS-Tests-AS-4.2, JBWS-Samples-AS-4.2</childProjects>
</hudson.tasks.BuildTrigger>
</publishers>
<buildWrappers class="vector"/>
Modified: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/resources/samples/build.xml
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/resources/samples/build.xml 2009-01-20 10:40:16 UTC (rev 9064)
+++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/resources/samples/build.xml 2009-01-20 10:41:22 UTC (rev 9065)
@@ -53,15 +53,9 @@
<property name="integration.target.${jbossws.integration.target}" value="true"/>
<!-- Define jboss.home -->
- <condition property="jboss.home" value="${jboss50.home}">
- <equals arg1="${jbossws.integration.target}" arg2="jboss50"/>
- </condition>
<condition property="jboss.home" value="${jboss42.home}">
<equals arg1="${jbossws.integration.target}" arg2="jboss42"/>
</condition>
- <condition property="jboss.home" value="${jboss40.home}">
- <equals arg1="${jbossws.integration.target}" arg2="jboss40"/>
- </condition>
<!-- Integration Target Server -->
<condition property="jbossws.integration.target.jboss">
@@ -145,7 +139,7 @@
<!--
Init the various classpaths
-->
- <target name="init" depends="prepare,jboss-classpath,tomcat-classpath"/>
+ <target name="init" depends="prepare,jboss-classpath"/>
<target name="common-classpath" depends="prepare,thirdparty">
@@ -155,10 +149,7 @@
<pathelement location="${tests.lib.dir}/jboss-jaxrpc.jar"/>
<pathelement location="${tests.lib.dir}/jboss-jaxws.jar"/>
<pathelement location="${tests.lib.dir}/jboss-saaj.jar"/>
- <pathelement location="${tests.lib.dir}/jbossws-jboss50-integration.jar"/>
<pathelement location="${tests.lib.dir}/jbossws-jboss42-integration.jar"/>
- <pathelement location="${tests.lib.dir}/jbossws-jboss40-integration.jar"/>
- <pathelement location="${tests.lib.dir}/jbossws-tomcat-integration.jar"/>
</path>
<!-- The combined compile classpath -->
@@ -223,15 +214,6 @@
</path>
</target>
- <target name="tomcat-classpath" depends="common-classpath" if="jbossws.integration.target.tomcat">
- <fail message="jdk-1.5 is required for Tomcat integration" unless="HAVE_JDK_1.5"/>
- <path id="test.client.classpath">
- <path refid="jbossws.classpath"/>
- <pathelement location="${tomcat.home}/common/lib/jbossws-thirdparty.jar"/>
- <path refid="javac.classpath"/>
- </path>
- </target>
-
<!-- ================================================================== -->
<!-- Generating sources -->
<!-- ================================================================== -->
Modified: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/build.xml
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/build.xml 2009-01-20 10:40:16 UTC (rev 9064)
+++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/build.xml 2009-01-20 10:41:22 UTC (rev 9065)
@@ -12,10 +12,7 @@
<import file="${basedir}/../build/ant-import/build-thirdparty.xml"/>
<import file="${basedir}/../build/ant-import/build-setup.xml"/>
- <import file="${basedir}/../integration-jboss50/build.xml"/>
<import file="${basedir}/../integration-jboss42/build.xml"/>
- <import file="${basedir}/../integration-jboss40/build.xml"/>
- <import file="${basedir}/../integration-tomcat/build.xml"/>
<import file="${basedir}/../jbossws-core/build.xml"/>
<import file="${basedir}/../jbossws-tests/ant-import/build-benchmark.xml"/>
@@ -47,15 +44,9 @@
<property name="integration.target.${jbossws.integration.target}" value="true"/>
<!-- Define jboss.home -->
- <condition property="jboss.home" value="${jboss50.home}">
- <equals arg1="${jbossws.integration.target}" arg2="jboss50"/>
- </condition>
<condition property="jboss.home" value="${jboss42.home}">
<equals arg1="${jbossws.integration.target}" arg2="jboss42"/>
</condition>
- <condition property="jboss.home" value="${jboss40.home}">
- <equals arg1="${jbossws.integration.target}" arg2="jboss40"/>
- </condition>
<!-- Integration Target Server -->
<condition property="jbossws.integration.target.jboss">
@@ -143,10 +134,7 @@
<target name="common-classpath" depends="prepare,thirdparty">
- <condition property="jbossws.classpath" value="jbossws.classpath.jdk15">
- <isset property="HAVE_JDK_1.5"/>
- </condition>
- <property name="jbossws.classpath" value="jbossws.classpath.jdk14"/>
+ <property name="jbossws.classpath" value="jbossws.classpath.jdk15"/>
<path id="jbossws.classpath.jdk15">
<pathelement location="${core.output.lib.dir}/jbossws-core.jar"/>
@@ -154,18 +142,8 @@
<pathelement location="${core.output.lib.dir}/jboss-jaxrpc.jar"/>
<pathelement location="${core.output.lib.dir}/jboss-jaxws.jar"/>
<pathelement location="${core.output.lib.dir}/jboss-saaj.jar"/>
- <pathelement location="${jboss50.output.lib.dir}/jbossws-jboss50-integration.jar"/>
<pathelement location="${jboss42.output.lib.dir}/jbossws-jboss42-integration.jar"/>
- <pathelement location="${jboss40.output.lib.dir}/jbossws-jboss40-integration.jar"/>
- <pathelement location="${tomcat.output.lib.dir}/jbossws-tomcat-integration.jar"/>
</path>
- <path id="jbossws.classpath.jdk14">
- <pathelement location="${core.output.lib.dir}/jboss-jaxrpc.jar"/>
- <pathelement location="${core.output.lib.dir}/jboss-saaj.jar"/>
- <pathelement location="${jboss40.output.lib.dir}/jbossws14-jboss40-integration.jar"/>
- <pathelement location="${jboss40.output.lib.dir}/jbossws14-client.jar"/>
- <pathelement location="${jboss40.output.lib.dir}/jbossws14-core.jar"/>
- </path>
<path id="jbossws.classpath" refid="${jbossws.classpath}"/>
<!-- The combined compile classpath -->
More information about the jbossws-commits
mailing list