From: Thomas D. <tdi...@us...> - 2004-05-30 11:39:56
|
User: tdiesler Date: 04/05/30 04:39:49 Modified: jboss.net build.xml Log: + jboss-net should use axis-ws4ee, so we don't have conflicting axis implementations deployed + temporarily disable axis-1.2beta features Revision Changes Path 1.56 +111 -104 contrib/jboss.net/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/contrib/jboss.net/build.xml,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- build.xml 22 Apr 2004 19:49:17 -0000 1.55 +++ build.xml 30 May 2004 11:39:49 -0000 1.56 @@ -15,7 +15,7 @@ <!-- --> <!-- ====================================================================== --> -<!-- $Id: build.xml,v 1.55 2004/04/22 19:49:17 tdiesler Exp $ --> +<!-- $Id: build.xml,v 1.56 2004/05/30 11:39:49 tdiesler Exp $ --> <project default="main" name="JBoss/JBoss.Net"> @@ -77,10 +77,11 @@ <!-- The combined library classpath --> <path id="library.classpath"> - <path refid="apache.axis.classpath"/> + <path refid="ws4ee.ws4ee.classpath"/> <path refid="apache.commons.classpath"/> <path refid="apache.crimson.classpath"/> <path refid="apache.log4j.classpath"/> + <path refid="apache.wss4j.classpath"/> <path refid="dom4j.dom4j.classpath"/> <path refid="juddi.juddi.classpath"/> <path refid="junit.junit.classpath"/> @@ -88,8 +89,9 @@ <path refid="sun.servlet.classpath"/> <path refid="sun.javamail.classpath"/> <path refid="sun.jaf.classpath"/> - <path refid="apache.wss4j.classpath"/> - <path><pathelement path="${project.thirdparty}/sun-jsse/lib/jsse.jar"/></path> + <path> + <pathelement path="${project.thirdparty}/sun-jsse/lib/jsse.jar"/> + </path> </path> <!-- ======= --> @@ -194,52 +196,51 @@ --> - <target name="compile" - depends="compile-etc, compile-resources, webdoclet, compile-classes" - description="Compile all source files."/> + <target name="compile" + depends="compile-etc, compile-resources, webdoclet, compile-classes" + description="Compile all source files."/> - <!-- Run WebDoclet --> - <target name="webdoclet" depends="compile-resources"> + <!-- Run WebDoclet --> + <target name="webdoclet" depends="compile-resources"> - <mkdir dir="${build.resources}/taglib/META-INF"/> + <mkdir dir="${build.resources}/taglib/META-INF"/> - <taskdef name="webdoclet" classname="xdoclet.modules.web.WebDocletTask" - classpath="${xdoclet.task.classpath}"/> + <taskdef name="webdoclet" classname="xdoclet.modules.web.WebDocletTask" + classpath="${xdoclet.task.classpath}"/> - <webdoclet - destdir="${build.gen-src}"> + <webdoclet + destdir="${build.gen-src}"> - <fileset dir="${source.java}"> - <include name="**/*Tag.java" /> - </fileset> + <fileset dir="${source.java}"> + <include name="**/*Tag.java"/> + </fileset> - <jsptaglib jspversion="1.2" - destdir="${build.resources}/taglib/META-INF" - filename="flash.tld" shortname="flash" validateXml="false"/> - </webdoclet> + <jsptaglib jspversion="1.2" + destdir="${build.resources}/taglib/META-INF" + filename="flash.tld" shortname="flash" validateXml="false"/> + </webdoclet> - <taskdef name="jmxdoclet" classname="xdoclet.modules.jmx.JMXDocletTask" - classpath="${xdoclet.task.classpath}"/> + <taskdef name="jmxdoclet" classname="xdoclet.modules.jmx.JMXDocletTask" + classpath="${xdoclet.task.classpath}"/> - <jmxdoclet - destdir="${build.gen-src}"> - <fileset dir="${source.java}"> - <include name="**/*Service.*"/> - <include name="**/*Deployer.*"/> - <include name="**/*Module.*"/> - </fileset> - <mbeaninterface/> - </jmxdoclet> + <jmxdoclet + destdir="${build.gen-src}"> + <fileset dir="${source.java}"> + <include name="**/*Service.*"/> + <include name="**/*Deployer.*"/> + <include name="**/*Module.*"/> + </fileset> + <mbeaninterface/> + </jmxdoclet> - </target> + </target> <!-- Compile all class files --> <target name="compile-classes" depends="webdoclet"> - <mkdir dir="${build.classes}/main"/> - + <javac destdir="${build.classes}/main" optimize="${javac.optimize}" @@ -255,26 +256,32 @@ <classpath refid="javac.classpath"/> <include name="${javac.includes}"/> <exclude name="${javac.excludes}"/> - <exclude name="org/jboss/net/axis/transport/mail/client/*"/> - <exclude name="org/jboss/net/ws4ee/**"/> + + <!-- + J2EE-1.4 compatible webservices are based on an axis-1.1 derivative (axis-ws4ee) + Unfortunately we have to disable some advanced JBoss-Net functionality, that depends on axis-1.2beta+ + Hopefully we can get it back as soon as ws4ee can use axis-1.2 + --> + <exclude name="org/jboss/net/axis/transport/mail/**"/> + <exclude name="org/jboss/net/axis/security/**"/> </javac> <mkdir dir="${build.classes}/tools"/> - - <javac destdir="${build.classes}/tools" - optimize="${javac.optimize}" - target="${javac.target}" - debug="${javac.debug}" - depend="${javac.depend}" - verbose="${javac.verbose}" - deprecation="${javac.deprecation}" - includeAntRuntime="${javac.include.ant.runtime}" - includeJavaRuntime="${javac.include.java.runtime}" - failonerror="${javac.fail.onerror}"> - <src path="${module.root}/src/tools"/> - <classpath refid="xdoclet.task.classpath"/> - <include name="${javac.includes}"/> - <exclude name="${javac.excludes}"/> + + <javac destdir="${build.classes}/tools" + optimize="${javac.optimize}" + target="${javac.target}" + debug="${javac.debug}" + depend="${javac.depend}" + verbose="${javac.verbose}" + deprecation="${javac.deprecation}" + includeAntRuntime="${javac.include.ant.runtime}" + includeJavaRuntime="${javac.include.java.runtime}" + failonerror="${javac.fail.onerror}"> + <src path="${module.root}/src/tools"/> + <classpath refid="xdoclet.task.classpath"/> + <include name="${javac.includes}"/> + <exclude name="${javac.excludes}"/> </javac> </target> @@ -283,7 +290,7 @@ <mkdir dir="${build.etc}"/> <copy todir="${build.etc}" filtering="yes"> <fileset dir="${source.etc}"> - <include name="**"/> + <include name="**"/> </fileset> </copy> </target> @@ -294,7 +301,7 @@ <mkdir dir="${build.resources}"/> <copy todir="${build.resources}" filtering="yes"> <fileset dir="${source.resources}"> - <include name="**/*"/> + <include name="**/*"/> </fileset> </copy> </target> @@ -308,26 +315,26 @@ --> <target name="jars" description="Build the Service Archive" - depends="_buildmagic:build-bypass-check" - unless="build-bypass.on"> + depends="_buildmagic:build-bypass-check" + unless="build-bypass.on"> <call target="compile"/> <mkdir dir="${build.lib}"/> - <jar jarfile="${build.lib}/${module.name}.jar" manifest="${build.etc}/default.mf"> - <fileset dir="${build.classes}/main"> + <jar jarfile="${build.lib}/${module.name}.jar" manifest="${build.etc}/default.mf"> + <fileset dir="${build.classes}/main"> <include name="**/jboss/net/**"/> <exclude name="**/taglib/**"/> </fileset> - </jar> + </jar> <copy toDir="${build.resources}/plugin/jboss-net.war"> - <fileset dir="${build.classes}/main"> - <include name="SOAP*.class"/> - </fileset> + <fileset dir="${build.classes}/main"> + <include name="SOAP*.class"/> + </fileset> </copy> - + <mkdir dir="${build.resources}/plugin/jboss-net.war/images"/> <copy toDir="${build.resources}/plugin/jboss-net.war/images"> @@ -348,8 +355,8 @@ <include name="**/*"/> </fileset> - <fileset dir="${apache.axis.lib}"> - <exclude name="axis-ant.jar"/> + <fileset dir="${ws4ee.ws4ee.lib}"> + <include name="axis-ws4ee.jar"/> </fileset> <fileset dir="${apache.commons.lib}"> @@ -365,11 +372,11 @@ </fileset> <fileset dir="${build.etc}"> - <include name="axis-config.xml"/> + <include name="axis-config.xml"/> </fileset> <fileset dir="${build.etc}"> - <include name="client-config.xml"/> + <include name="client-config.xml"/> </fileset> <fileset dir="${apache.wss4j.lib}"> @@ -387,19 +394,19 @@ </copy> <jar jarfile="${build.lib}/${module.name}-client.jar" - manifest="${build.etc}/default.mf"> + manifest="${build.etc}/default.mf"> <fileset dir="${build.classes}/main"> <include name="**/jboss/net/**"/> <exclude name="**/server/**"/> <exclude name="**/taglib/**"/> </fileset> <fileset dir="${build.etc}"> - <include name="client-config.wsdd"/> + <include name="client-config.wsdd"/> </fileset> </jar> <jar jarfile="${build.lib}/${module.name}-taglib.jar" - manifest="${build.etc}/default.mf"> + manifest="${build.etc}/default.mf"> <fileset dir="${build.classes}/main"> <include name="**/jboss/net/taglib/**"/> </fileset> @@ -410,7 +417,7 @@ </jar> <jar jarfile="${build.lib}/xdoclet-module-jboss-net.jar" - manifest="${build.etc}/default.mf"> + manifest="${build.etc}/default.mf"> <fileset dir="${build.classes}/tools"> <include name="**/net/**"/> </fileset> @@ -436,27 +443,27 @@ <!-- Install & Release --> <!-- ================================================================== --> - <target name="install" - description="Install the structure for a release." - depends="all, _buildmagic:install:default"/> + <target name="install" + description="Install the structure for a release." + depends="all, _buildmagic:install:default"/> <target name="release" depends="install"/> - <target name="release-zip" - description="Builds a ZIP distribution." - depends="release, _buildmagic:release:zip"/> - - <target name="release-tar" - description="Builds a TAR distribution." - depends="release, _buildmagic:release:tar"/> - - <target name="release-tgz" - description="Builds a TAR-GZ distribution." - depends="release, _buildmagic:release:tgz"/> + <target name="release-zip" + description="Builds a ZIP distribution." + depends="release, _buildmagic:release:zip"/> + + <target name="release-tar" + description="Builds a TAR distribution." + depends="release, _buildmagic:release:tar"/> + + <target name="release-tgz" + description="Builds a TAR-GZ distribution." + depends="release, _buildmagic:release:tgz"/> <target name="release-all" - description="Builds a distribution for each archive type." - depends="release-zip, release-tgz"/> + description="Builds a distribution for each archive type." + depends="release-zip, release-tgz"/> <!-- ================================================================== --> <!-- Cleaning --> @@ -464,16 +471,16 @@ <!-- Clean up all build output --> - <target name="clean" - description="Cleans up most generated files." - depends="_buildmagic:clean"> + <target name="clean" + description="Cleans up most generated files." + depends="_buildmagic:clean"> </target> <!-- Clean up all generated files --> - <target name="clobber" - description="Cleans up all generated files." - depends="_buildmagic:clobber, clean"> + <target name="clobber" + description="Cleans up all generated files." + depends="_buildmagic:clobber, clean"> </target> <!-- ================================================================== --> @@ -481,20 +488,20 @@ <!-- ================================================================== --> <target name="main" - description="Executes the default target (most)." - depends="most"/> + description="Executes the default target (most)." + depends="most"/> <target name="all" - description="Builds everything." - depends="jars, docs"/> + description="Builds everything." + depends="jars, docs"/> - <target name="most" - description="Builds almost everything." - depends="jars"/> - - <target name="help" - description="Show this help message." - depends="_buildmagic:help:standard"/> + <target name="most" + description="Builds almost everything." + depends="jars"/> + + <target name="help" + description="Show this help message." + depends="_buildmagic:help:standard"/> </project> |