--- etc/build-bundle.xml 2012-06-19 14:39:53.000000000 +0200
+++ etc/build-bundle.xml-gil 2012-10-29 10:20:48.222831026 +0100
@@ -43,7 +43,7 @@
<!-- ************ JAXWS build file ************************************** -->
-<project xmlns:ivy="antlib:org.apache.ivy.ant" name="jax-ws" default="main" basedir=".">
+<project name="jax-ws" default="main" basedir=".">
<property name="Name" value="JAX-WS RI"/>
@@ -95,23 +95,47 @@
<echo>svn Last Changed Rev: ${svn.Last.Changed.Rev}</echo>
<path id="runtime.compile.classpath">
- <fileset dir="${lib.home}">
- <include name="*.jar"/>
- <exclude name="ant.jar"/>
- <exclude name="*-source.jar"/>
- <exclude name="*-javadoc.jar"/>
+ <fileset dir="/usr/share/java" >
+ <include name="codemodel.jar"/>
+ <include name="glassfish-fastinfoset.jar"/>
+ <include name="glassfish-gmbal-api-only.jar"/>
+ <include name="glassfish-ha-api.jar"/>
+ <include name="jaxb-api.jar"/>
+ <include name="glassfish-jaxb/jaxb-impl.jar"/>
+ <include name="glassfish-jaxb/jaxb-xjc.jar"/>
+ <include name="glassfish-management-api.jar"/>
+ <include name="glassfish-pfl/glassfish-pfl-tf.jar"/>
+ <include name="glassfish-policy.jar"/>
+ <include name="glassfish-saaj.jar"/>
+ <include name="istack-commons-buildtools.jar"/>
+ <include name="istack-commons-runtime.jar"/>
+ <include name="istack-commons-tools.jar"/>
+ <include name="jboss-annotations-1.1-api.jar"/>
+ <include name="jboss-jaxws-2.2-api.jar"/>
+ <include name="jboss-jsp-2.2-api.jar"/>
+ <include name="jboss-saaj-1.3-api.jar"/>
+ <include name="jboss-servlet-3.0-api.jar"/>
+ <include name="mimepull.jar"/>
+ <include name="objectweb-asm/asm.jar"/>
+ <include name="stax2-api.jar"/>
+ <include name="stax-ex.jar"/>
+ <include name="txw2.jar"/>
+ <include name="woodstox-core-lgpl.jar"/>
+ <include name="xmlstreambuffer.jar"/>
+ <include name="xml-commons-resolver.jar"/>
+ <include name="xsom.jar"/>
</fileset>
</path>
<path id="boot.classpath">
- <fileset dir="${lib.home}">
- <include name="jaxws-api.jar"/>
+ <fileset dir="/usr/share/java">
+ <include name="jboss-jaxws-2.2-api.jar"/>
</fileset>
</path>
<path id="tools.compile.classpath">
<path refid="runtime.compile.classpath"/>
- <pathelement location="${lib.home}/ant.jar"/>
+ <pathelement location="/usr/share/java/ant.jar"/>
<pathelement location="${build.home}/lib/jaxws-rt.jar"/>
<pathelement location="${java.home}/../lib/tools.jar"/>
</path>
@@ -120,7 +144,7 @@
<echo message="-------- ${Name} ${release.impl.version} --------"/>
</target>
- <property name="ivy.jar.dir" value="${basedir}/ivy"/>
+ <!--property name="ivy.jar.dir" value="${basedir}/ivy"/>
<property name="ivy.jar.file" value="${ivy.jar.dir}/ivy.jar"/>
<target name="download-ivy" unless="skip.download">
@@ -129,7 +153,7 @@
<get ignoreerrors="true" src="http://search.maven.org/remotecontent?filepath=org/apache/ivy/ivy/${ivy.install.version}/ivy-${ivy.install.version}.jar" dest="${ivy.jar.file}" usetimestamp="true"/>
</target>
- <target name="install-ivy" depends="download-ivy" description="--> install ivy">
+ <target name="install-ivy" depends="download-ivy" description="> install ivy">
<path id="ivy.lib.path">
<fileset dir="${ivy.jar.dir}" includes="*.jar"/>
</path>
@@ -148,9 +172,9 @@
<copy todir="${lib.home}">
<fileset dir="tools/lib" includes="jaxws-asm*"/>
</copy>
- </target>
+ </target-->
- <target name="prepare" depends="init, retrieve-deps">
+ <target name="prepare" depends="init">
<mkdir dir="${build.home}"/>
<mkdir dir="${build.home}/lib"/>
<mkdir dir="${build.home}/plugins_lib"/>
@@ -191,13 +215,13 @@
<pathelement path="${basedir}/eclipselink_sdo/src"/>
</path>
- <target name="clean-ivy" description="--> clean the ivy installation">
+ <!--target name="clean-ivy" description="> clean the ivy installation">
<delete dir="${ivy.jar.dir}"/>
</target>
- <target name="clean-cache" depends="install-ivy" description="--> clean the ivy cache">
+ <target name="clean-cache" depends="install-ivy" description="> clean the ivy cache">
<ivy:cleancache/>
- </target>
+ </target-->
<target name="javadocs" depends="image">
<javadoc
@@ -212,7 +236,7 @@
<classpath>
<path refid="runtime.compile.classpath"/>
<path refid="tools.compile.classpath"/>
- <fileset dir="${basedir}/servlet/lib" includes="servlet.jar"/>
+ <fileset dir="${build.home}/lib" includes="jaxws-rt.jar"/>
<pathelement location="${java.home}/../lib/tools.jar"/>
</classpath>
</javadoc>
@@ -284,8 +308,8 @@
bottom="Copyright (c) 1997-2012 Oracle and/or its affiliates. All rights reserved.">
<classpath>
<path refid="runtime.compile.classpath"/>
- <fileset dir="${basedir}/servlet/lib" includes="servlet.jar"/>
- <fileset dir="${basedir}/lib" includes="ha-api.jar" />
+ <fileset dir="${build.home}/lib" includes="jaxws-rt.jar"/>
+ <fileset dir="/usr/share/java" includes="glassfish-ha-api.jar" />
</classpath>
<link href="http://jaxb.java.net/nonav/${jaxb.impl.version}/docs/api/"
offline="true" packagelistloc="${basedir}/tools/javadoc-link/jaxb-api"/>
@@ -294,9 +318,9 @@
<link href="http://download.oracle.com/javase/1.5.0/docs/api/"
offline="true" packagelistloc="${basedir}/tools/javadoc-link/j2se5.0"/>
</javadoc>
- <zip zipfile="${build.home}/lib/jaxws-rt-javadoc.jar">
+ <!--zip zipfile="${build.home}/lib/jaxws-rt-javadoc.jar">
<fileset dir="${build.home}/javadocs/rt"/>
- </zip>
+ </zip-->
<ant dir="${basedir}/httpspi-servlet" target="jar"/>
<copy file="${basedir}/eclipselink_jaxb/etc/manifest" todir="${basedir}/eclipselink_jaxb/build"/>
@@ -379,7 +403,7 @@
</copy>
<!-- copy bin scripts -->
- <copy todir="${build.home}/bin">
+ <!--copy todir="${build.home}/bin">
<fileset dir="${basedir}/tools/bin"
includes="wsimport.sh, wsimport.bat wsgen.bat wsgen.sh"/>
</copy>
@@ -390,7 +414,7 @@
includes="mail.jar, FastInfoset.jar, gmbal-api-only.jar, management-api.jar, jaxb-api.jar, jaxb-impl.jar, jaxb-xjc.jar, jaxws-api.jar, jaxws-rt.jar, jaxws-tools.jar, jsr181-api.jar, javax.annotation.jar, saaj-api.jar, saaj-impl.jar, stax-ex.jar, streambuffer.jar, mimepull.jar, policy.jar, ha-api.jar"/>
</copy>
- <antcall target="copy-woodstox-libs"/>
+ <antcall target="copy-woodstox-libs"/-->
<!-- Copying the manifest -->
<copy file="${basedir}/tools/etc/manifest" todir="${basedir}/tools/wscompile/build"/>
@@ -423,8 +447,8 @@
<classpath>
<path refid="runtime.compile.classpath"/>
<path refid="tools.compile.classpath"/>
- <fileset dir="${basedir}/servlet/lib" includes="servlet.jar"/>
- <fileset dir="${basedir}/lib" includes="ha-api.jar" />
+ <fileset dir="${build.home}/lib" includes="jaxws-rt.jar"/>
+ <fileset dir="/usr/share/java" includes="glassfish-ha-api.jar" />
</classpath>
<link href="http://jaxb.java.net/nonav/${jaxb.impl.version}/docs/api/"
offline="true" packagelistloc="${basedir}/tools/javadoc-link/jaxb-api"/>
@@ -433,9 +457,9 @@
<link href="http://download.oracle.com/javase/1.5.0/docs/api/"
offline="true" packagelistloc="${basedir}/tools/javadoc-link/j2se5.0"/>
</javadoc>
- <zip zipfile="${build.home}/lib/jaxws-tools-javadoc.jar">
+ <!--zip zipfile="${build.home}/lib/jaxws-tools-javadoc.jar">
<fileset dir="${build.home}/javadocs/tools"/>
- </zip>
+ </zip-->
</target>
<target name="copy-woodstox-libs" description="Copies woodstox.jar into distribution jars" if="woodstox">
