[jbossws-commits] JBossWS SVN: r2276 - in branches/jbossws-1.2.0: integration-jboss40 and 2 other directories.

Author: thomas.diesler(a)jboss.com Date: 2007-02-05 06:49:39 -0500 (Mon, 05 Feb 2007) New Revision: 2276 Modified: branches/jbossws-1.2.0/build/ant-import/build-setup.xml branches/jbossws-1.2.0/integration-jboss40/build.xml branches/jbossws-1.2.0/integration-jboss42/build.xml branches/jbossws-1.2.0/integration-jboss50/build.xml Log: Update compile target availablility Modified: branches/jbossws-1.2.0/build/ant-import/build-setup.xml =================================================================== --- branches/jbossws-1.2.0/build/ant-import/build-setup.xml 2007-02-05 11:19:25 UTC (rev 2275) +++ branches/jbossws-1.2.0/build/ant-import/build-setup.xml 2007-02-05 11:49:39 UTC (rev 2276) @@ -63,11 +63,16 @@ <property name="tomcat.common.lib" value="${tomcat.home}/common/lib"/> <property name="tomcat.webapps.dir" value="${tomcat.home}/webapps"/> - <available property="jboss50.available" file="${jboss50.client}/jboss-client.jar"/> - <available property="jboss42.available" file="${jboss42.client}/jboss-client.jar"/> - <available property="jboss40.available" file="${jboss40.client}/jboss-client.jar"/> - <available property="tomcat.available" file="${tomcat.home}/server/lib/catalina.jar"/> + <property name="jboss50.available.file" value="${jboss50.client}/jboss-ejb3-client.jar"/> + <property name="jboss42.available.file" value="${jboss42.client}/jboss-ejb3-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"/> <available classname="java.lang.Enum" property="HAVE_JDK_1.5"/> Modified: branches/jbossws-1.2.0/integration-jboss40/build.xml =================================================================== --- branches/jbossws-1.2.0/integration-jboss40/build.xml 2007-02-05 11:19:25 UTC (rev 2275) +++ branches/jbossws-1.2.0/integration-jboss40/build.xml 2007-02-05 11:49:39 UTC (rev 2276) @@ -11,7 +11,8 @@ <!-- $Id$ --> -<project default="main" basedir="../integration-jboss40" name="JBossWS-jboss40"> +<project default="main" basedir="../integration-jboss40" name="JBossWS-jboss40" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="schema.xsd"> <import file="${basedir}/../build/ant-import/build-thirdparty.xml"/> <import file="${basedir}/../build/ant-import/build-setup.xml"/> @@ -25,7 +26,7 @@ <property name="jboss40.output.classes.dir" value="${jboss40.output.dir}/classes"/> <property name="jboss40.output.classes14.dir" value="${jboss40.output.dir}/classes14"/> <property name="jboss40.output.lib.dir" value="${jboss40.output.dir}/lib"/> - + <property name="jboss42.src.dir" value="${integration.jboss42.dir}/src/main"/> <property name="jboss42.java.dir" value="${jboss42.src.dir}/java"/> <property name="jboss42.resources.dir" value="${jboss42.src.dir}/resources"/> @@ -33,9 +34,9 @@ <property name="jboss42.output.classes.dir" value="${jboss42.output.dir}/classes"/> <property name="jboss42.output.classes14.dir" value="${jboss42.output.dir}/classes14"/> <property name="jboss42.output.lib.dir" value="${jboss42.output.dir}/lib"/> - + <target name="jboss40-init" depends="prepare, thirdparty"> - <fail message="Not available: ${jboss40.client}/jboss-client.jar" unless="jboss40.available"/> + <fail message="Not available: ${jboss40.available.file}" unless="jboss40.available"/> <available file="${jboss40.client}/jboss-ejb3-client.jar" property="jboss40.ejb3.available"/> </target> @@ -51,14 +52,12 @@ | documentation compiles. --> - <target name="jboss40-compile" depends="jboss40-compile-classes,jboss40-compile-ejb3-classes,jboss40-compile-etc" - description="Compile all source files."/> + <target name="jboss40-compile" depends="jboss40-compile-classes,jboss40-check-ejb3-classes,jboss40-compile-ejb3-classes,jboss40-compile-etc" description="Compile all source files."/> <!-- Compile integration java sources --> <target name="jboss40-compile-classes" depends="jboss40-init,core-compile"> <mkdir dir="${jboss40.output.classes.dir}"/> - <javac srcdir="${jboss42.java.dir}" sourcepath="" destdir="${jboss40.output.classes.dir}" - encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" + <javac srcdir="${jboss42.java.dir}" sourcepath="" destdir="${jboss40.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}"> <include name="org/jboss/ws/integration/jboss42/**"/> <exclude name="org/jboss/ws/integration/jboss42/DeployerInterceptorEJB3.java"/> @@ -71,8 +70,7 @@ </target> <target name="jboss40-compile-ejb3-classes" depends="jboss40-init,core-compile" if="jboss40.ejb3.available"> <mkdir dir="${jboss40.output.classes.dir}"/> - <javac srcdir="${jboss42.java.dir}" sourcepath="" destdir="${jboss40.output.classes.dir}" - encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" + <javac srcdir="${jboss42.java.dir}" sourcepath="" destdir="${jboss40.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}"> <include name="org/jboss/ws/integration/jboss42/DeployerInterceptorEJB3.java"/> <include name="org/jboss/ws/integration/jboss42/ServiceEndpointGeneratorEJB3.java"/> @@ -82,6 +80,13 @@ <classpath path="${core.output.classes.dir}"/> </javac> </target> + <target name="jboss40-check-ejb3-classes" depends="jboss40-init" unless="jboss40.ejb3.available"> + <echo message="****************************************"/> + <echo message="* EJB3 not available *"/> + <echo message="* jboss40 integartion layer will be *"/> + <echo message="* build without EJB3 support! *"/> + <echo message="****************************************"/> + </target> <!-- Compile etc files (manifests and such) --> <target name="jboss40-compile-etc" depends="jboss40-init"> @@ -92,7 +97,7 @@ <!-- ================================================================== --> <target name="jboss40-retro" depends="jboss40-compile,core-compile"> - + <!-- Weave the build.classes to build.classes14 --> <taskdef name="retro" classname="org.jboss.ant.tasks.retro.Retro"> <classpath> @@ -100,7 +105,7 @@ <pathelement location="${thirdparty.dir}/jbossretro.jar"/> </classpath> </taskdef> - + <mkdir dir="${jboss40.output.classes14.dir}"/> <retro destdir="${jboss40.output.classes14.dir}"> <classpath> @@ -120,7 +125,7 @@ <src path="${core.dir}/output/classes"/> </retro> </target> - + <!-- ================================================================== --> <!-- Archives --> <!-- ================================================================== --> @@ -128,7 +133,7 @@ <!-- | Build all jar files. --> - <target name="jboss40-jars" depends="jboss40-compile,jboss40-module-jars" description="Builds all jar files."> + <target name="jboss40-jars" depends="jboss40-compile,jboss40-module-jars" description="Builds all jar files."> </target> <!-- @@ -195,7 +200,7 @@ | Build retrotranslated jar files. --> <target name="jboss40-jars14" depends="jboss40-jars,jboss40-retro"> - + <!-- Build jbossws14-core.jar --> <mkdir dir="${jboss40.output.lib.dir}"/> <jar jarfile="${jboss40.output.lib.dir}/jbossws14-core.jar" manifest="${etc.dir}/default.mf"> @@ -209,7 +214,7 @@ <include name="dtd/**"/> </fileset> </jar> - + <!-- Build jbossws14-jboss40-integration.jar --> <jar jarfile="${jboss40.output.lib.dir}/jbossws14-jboss40-integration.jar" manifest="${etc.dir}/default.mf"> <fileset dir="${jboss40.output.classes14.dir}"> @@ -244,9 +249,10 @@ </fileset> <metainf dir="${core.resources.dir}/jboss-saaj.jar/META-INF"/> </jar> - + <mkdir dir="${jboss40.output.dir}/resources/jbossws40-jdk14.sar/META-INF"/> - <copy tofile="${jboss40.output.dir}/resources/jbossws40-jdk14.sar/META-INF/jboss-service.xml" file="${jboss42.resources.dir}/jbossws.sar/META-INF/jboss-service-no-ejb3.xml"/> + <copy tofile="${jboss40.output.dir}/resources/jbossws40-jdk14.sar/META-INF/jboss-service.xml" + file="${jboss42.resources.dir}/jbossws.sar/META-INF/jboss-service-no-ejb3.xml"/> <!-- Build jbossws40-jdk14.sar --> <jar jarfile="${jboss40.output.lib.dir}/jbossws40-jdk14.sar" manifest="${etc.dir}/default.mf"> @@ -277,7 +283,7 @@ <include name="jboss-service.xml"/> </metainf> </jar> - + </target> <!-- ================================================================== --> Modified: branches/jbossws-1.2.0/integration-jboss42/build.xml =================================================================== --- branches/jbossws-1.2.0/integration-jboss42/build.xml 2007-02-05 11:19:25 UTC (rev 2275) +++ branches/jbossws-1.2.0/integration-jboss42/build.xml 2007-02-05 11:49:39 UTC (rev 2276) @@ -26,7 +26,7 @@ <property name="jboss42.output.lib.dir" value="${jboss42.output.dir}/lib"/> <target name="jboss42-init" depends="prepare, thirdparty"> - <fail message="Not available: ${jboss42.client}/jboss-client.jar" unless="jboss42.available"/> + <fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/> </target> <!-- ================================================================== --> Modified: branches/jbossws-1.2.0/integration-jboss50/build.xml =================================================================== --- branches/jbossws-1.2.0/integration-jboss50/build.xml 2007-02-05 11:19:25 UTC (rev 2275) +++ branches/jbossws-1.2.0/integration-jboss50/build.xml 2007-02-05 11:49:39 UTC (rev 2276) @@ -26,7 +26,7 @@ <property name="jboss50.output.lib.dir" value="${jboss50.output.dir}/lib"/> <target name="jboss50-init" depends="prepare, thirdparty"> - <fail message="Not available: ${jboss50.client}/jboss-client.jar" unless="jboss50.available"/> + <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/> </target> <!-- ================================================================== -->