Author: thomas.diesler(a)jboss.com Date: 2007-01-24 06:24:36 -0500 (Wed, 24 Jan 2007) New Revision: 2063 Modified: branches/jbossws-1.2.0/build/ant-import/build-thirdparty.xml branches/jbossws-1.2.0/integration-jboss40/build.xml Log: Make jboss40 build independent of jboss42.home Modified: branches/jbossws-1.2.0/build/ant-import/build-thirdparty.xml =================================================================== --- branches/jbossws-1.2.0/build/ant-import/build-thirdparty.xml 2007-01-24 11:09:22 UTC (rev 2062) +++ branches/jbossws-1.2.0/build/ant-import/build-thirdparty.xml 2007-01-24 11:24:36 UTC (rev 2063) @@ -126,6 +126,18 @@ <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 jboss42 integration --> <path id="tomcat.integration.classpath"> <path refid="core.classpath"/> Modified: branches/jbossws-1.2.0/integration-jboss40/build.xml =================================================================== --- branches/jbossws-1.2.0/integration-jboss40/build.xml 2007-01-24 11:09:22 UTC (rev 2062) +++ branches/jbossws-1.2.0/integration-jboss40/build.xml 2007-01-24 11:24:36 UTC (rev 2063) @@ -55,9 +55,9 @@ <!-- Compile integration java sources --> <target name="jboss40-compile-classes" depends="jboss40-init,core-compile"> <mkdir dir="${jboss40.output.classes.dir}"/> - <javac srcdir="${jboss40.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/jboss40/**"/> + <include name="org/jboss/ws/integration/jboss42/**"/> <classpath refid="jboss40.integration.classpath"/> <classpath path="${core.output.classes14.dir}"/> <classpath path="${core.output.classes.dir}"/> @@ -115,12 +115,12 @@ <!-- | Build all jar files. --> - <target name="jboss40-module-jars" depends="core-jars,jboss42-jars"> + <target name="jboss40-module-jars" depends="core-jars"> <!-- Build jbossws-jboss40-integration.jar --> <mkdir dir="${jboss40.output.lib.dir}"/> <jar jarfile="${jboss40.output.lib.dir}/jbossws-jboss40-integration.jar" manifest="${etc.dir}/default.mf"> - <fileset dir="${jboss42.output.classes.dir}"> + <fileset dir="${jboss40.output.classes.dir}"> <include name="org/jboss/ws/integration/jboss42/**"/> </fileset> <metainf dir="${jboss42.resources.dir}/jbossws-jboss42-integration.jar/META-INF"/>