diff -Nru glassfish-jaxws-2.2.7/httpspi-servlet/build.xml glassfish-jaxws-2.2.7-gil/httpspi-servlet/build.xml
--- glassfish-jaxws-2.2.7/httpspi-servlet/build.xml 2011-08-25 12:49:35.000000000 +0200
+++ glassfish-jaxws-2.2.7-gil/httpspi-servlet/build.xml 2012-10-29 09:59:05.885278973 +0100
@@ -46,6 +46,12 @@
<property name="build.dir" value="${basedir}/build"/>
<property file="../project.properties"/>
+ <path id="runtime.compile.classpath">
+ <fileset dir="/usr/share/java" >
+ <include name="jboss-servlet-3.0-api.jar"/>
+ </fileset>
+ </path>
+
<target name="compile">
<mkdir dir="${build.dir}/classes"/>
<javac srcdir="src"
@@ -54,11 +60,11 @@
deprecation="${compile.deprecation}"
optimize="${compile.optimize}"
source="1.5">
- <compilerarg value="-Xbootclasspath/p:${lib.home}/jaxws-api.jar"/>
+ <compilerarg value="-Xbootclasspath/p:/usr/share/java/jboss-jaxws-2.2-api.jar"/>
<classpath>
<path refid="runtime.compile.classpath"/>
- <fileset dir="lib" includes="*.jar" />
<pathelement path="../rt/build/classes" />
+ <pathelement path="${basedir}/build/classes" />
</classpath>
</javac>
</target>
diff -Nru glassfish-jaxws-2.2.7/rt/build.xml glassfish-jaxws-2.2.7-gil/rt/build.xml
--- glassfish-jaxws-2.2.7/rt/build.xml 2012-06-20 10:47:17.000000000 +0200
+++ glassfish-jaxws-2.2.7-gil/rt/build.xml 2012-10-29 08:58:21.575655429 +0100
@@ -46,35 +46,74 @@
<property name="build.dir" value="${basedir}/build"/>
<property file="../project.properties"/>
+ <path id="runtime.compile.classpath">
+ <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="istack.cp">
+ <fileset dir="/usr/share/java" >
+ <include name="istack-commons-buildtools.jar"/>
+ <include name="codemodel.jar"/>
+ </fileset>
+ </path>
+
+ <taskdef name="resgen" classname="com.sun.istack.build.ResourceGenTask">
+ <classpath refid="istack.cp"/>
+ </taskdef>
+
<target name="prepare">
<mkdir dir="${build.dir}/classes"/>
+ <mkdir dir="${build.dir}/gen-src"/>
<mkdir dir="${build.dir}/test-classes"/>
<mkdir dir="${build.dir}/test-reports"/>
</target>
<target name="generate-code" depends="prepare"
description="build and run all the code generators">
- <sequential>
- <exec executable="${mvn.exec}" failonerror="true" dir="${basedir}/src">
- <arg line="${mvn.extra.args}"/>
- <arg line="-DdestDir=../build/gen-src"/>
- <arg line="-Dresources=com/sun/xml/ws/resources/*.properties"/>
- <arg line="-Dlicense=../../etc/CDDL+GPLv2.xml"/>
- <arg line="com.sun.istack:istack-commons-maven-plugin:2.12:rs-gen"/>
- </exec>
- </sequential>
+ <resgen destdir="${build.dir}/gen-src" encoding="UTF-8">
+ <resource dir="src" includes="com/sun/xml/ws/resources/*.properties"/>
+ </resgen>
</target>
<target name="compile" depends="generate-code">
<!-- do this to bundle ASM classes into jaxws-rt.jar -->
- <unjar src="${basedir}/../lib/jaxws-asm.jar" dest="${basedir}/build/classes" />
- <javac srcdir="src:build/gen-src"
+ <!--unjar src="${basedir}/../lib/jaxws-asm.jar" dest="${basedir}/build/classes" /-->
+ <javac srcdir="src:${build.dir}/gen-src"
destdir="${basedir}/build/classes"
debug="${compile.debug}"
deprecation="${compile.deprecation}"
optimize="${compile.optimize}"
source="1.5">
- <compilerarg value="-Xbootclasspath/p:${lib.home}/jaxws-api.jar"/>
+ <compilerarg value="-Xbootclasspath/p:/usr/share/java/jboss-jaxws-2.2-api.jar"/>
<classpath refid="runtime.compile.classpath"/>
</javac>
<!-- Copy AnnotationProcessor factory info -->
@@ -88,14 +127,14 @@
</target>
<target name="compile-mustang" depends="generate-code">
- <javac srcdir="src:build/gen-src"
+ <javac srcdir="src:${build.dir}/gen-src"
destdir="${basedir}/build/classes"
debug="${compile.debug}"
deprecation="${compile.deprecation}"
optimize="${compile.optimize}"
source="1.5"
excludes="**/JaxWsRtObjectFactory*.java,**/WSServletContext.java,**/WSDLPublisher.java,**/servlet/,**/ServletDelegate.java, **/ServletSecondDelegate.java, **/FastInfoset*.java, **/SourceReaderFactory.java">
- <compilerarg value="-Xbootclasspath/p:${lib.home}/jaxws-api.jar"/>
+ <compilerarg value="-Xbootclasspath/p:/usr/share/java/jboss-jaxws-2.2-api.jar"/>
<classpath refid="runtime.compile.classpath"/>
</javac>
</target>
@@ -117,13 +156,16 @@
<pathelement path="${build.dir}/test-classes" />
<!-- so that resources can be found -->
<pathelement path="${basedir}/test"/>
+ <fileset dir="/usr/share/java" >
+ <include name="junit.jar"/>
+ </fileset>
</path>
<javac srcdir="${basedir}/test"
destdir="${build.dir}/test-classes"
debug="${compile.debug}"
optimize="${compile.optimize}">
- <compilerarg value="-Xbootclasspath/p:${lib.home}/jaxws-api.jar"/>
+ <compilerarg value="-Xbootclasspath/p:/usr/share/java/jboss-jaxws-2.2-api.jar"/>
<classpath refid="test.classpath"/>
</javac>
diff -Nru glassfish-jaxws-2.2.7/rt-fi/build.xml glassfish-jaxws-2.2.7-gil/rt-fi/build.xml
--- glassfish-jaxws-2.2.7/rt-fi/build.xml 2010-10-21 17:54:46.000000000 +0200
+++ glassfish-jaxws-2.2.7-gil/rt-fi/build.xml 2012-10-29 09:15:37.834521432 +0100
@@ -46,6 +46,14 @@
<property name="build.dir" value="${basedir}/build"/>
<property file="../project.properties"/>
+ <path id="runtime.compile.classpath">
+ <fileset dir="/usr/share/java" >
+ <include name="glassfish-fastinfoset.jar"/>
+ <include name="jboss-jaxws-2.2-api.jar"/>
+ <include name="xmlstreambuffer.jar"/>
+ </fileset>
+ </path>
+
<target name="compile">
<mkdir dir="${build.dir}/classes"/>
<javac srcdir="src"
diff -Nru glassfish-jaxws-2.2.7/rt-ha/build.xml glassfish-jaxws-2.2.7-gil/rt-ha/build.xml
--- glassfish-jaxws-2.2.7/rt-ha/build.xml 2011-12-16 09:54:10.000000000 +0100
+++ glassfish-jaxws-2.2.7-gil/rt-ha/build.xml 2012-10-29 09:24:55.572554600 +0100
@@ -46,6 +46,18 @@
<property name="build.dir" value="${basedir}/build"/>
<property file="../project.properties"/>
+ <path id="runtime.compile.classpath">
+ <fileset dir="/usr/share/java" >
+ <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="istack-commons-runtime.jar"/>
+ <include name="jboss-jaxws-2.2-api.jar"/>
+ </fileset>
+ </path>
+
<target name="compile">
<mkdir dir="${build.dir}/classes"/>
<javac srcdir="src"
@@ -56,7 +68,6 @@
source="1.5">
<classpath>
<path refid="runtime.compile.classpath"/>
- <fileset dir="${basedir}/../lib" includes="ha-api.jar" />
<pathelement path="../rt/build/classes" />
</classpath>
</javac>
@@ -76,6 +87,9 @@
<pathelement path="${build.dir}/classes" />
<pathelement path="${build.dir}/test-classes" />
<pathelement path="test"/>
+ <fileset dir="/usr/share/java" >
+ <include name="junit.jar"/>
+ </fileset>
</path>
<javac srcdir="test"
diff -Nru glassfish-jaxws-2.2.7/servlet/build.xml glassfish-jaxws-2.2.7-gil/servlet/build.xml
--- glassfish-jaxws-2.2.7/servlet/build.xml 2010-12-07 02:19:17.000000000 +0100
+++ glassfish-jaxws-2.2.7-gil/servlet/build.xml 2012-10-29 09:17:59.246153043 +0100
@@ -46,6 +46,15 @@
<property name="build.dir" value="${basedir}/build"/>
<property file="../project.properties"/>
+ <path id="runtime.compile.classpath">
+ <fileset dir="/usr/share/java" >
+ <include name="glassfish-management-api.jar"/>
+ <include name="istack-commons-runtime.jar"/>
+ <include name="jboss-jaxws-2.2-api.jar"/>
+ <include name="jboss-servlet-3.0-api.jar"/>
+ </fileset>
+ </path>
+
<target name="compile">
<mkdir dir="${build.dir}/classes"/>
<javac srcdir="src"
@@ -56,7 +65,6 @@
source="1.5">
<classpath>
<path refid="runtime.compile.classpath"/>
- <fileset dir="lib" includes="javax.servlet.jar" />
<pathelement path="../rt/build/classes" />
<pathelement path="../rt-ha/build/classes" />
</classpath>
diff -Nru glassfish-jaxws-2.2.7/tools/wscompile/build.xml glassfish-jaxws-2.2.7-gil/tools/wscompile/build.xml
--- glassfish-jaxws-2.2.7/tools/wscompile/build.xml 2012-06-19 15:38:03.000000000 +0200
+++ glassfish-jaxws-2.2.7-gil/tools/wscompile/build.xml 2012-10-29 09:14:41.134877826 +0100
@@ -46,33 +46,65 @@
<property name="build.dir" value="${basedir}/build"/>
<property file="../../project.properties"/>
+ <path id="tools.compile.classpath">
+ <pathelement location="/usr/share/java/ant.jar"/>
+ <pathelement location="../../build/lib/jaxws-rt.jar"/>
+ <pathelement location="${java.home}/../lib/tools.jar"/>
+ <fileset dir="/usr/share/java" >
+ <include name="codemodel.jar"/>
+ <include name="jaxb-api.jar"/>
+ <include name="glassfish-jaxb/jaxb-impl.jar"/>
+ <include name="glassfish-jaxb/jaxb-xjc.jar"/>
+ <include name="glassfish-policy.jar"/>
+ <include name="istack-commons-runtime.jar"/>
+ <include name="istack-commons-tools.jar"/>
+ <include name="jboss-jaxws-2.2-api.jar"/>
+ <include name="txw2.jar"/>
+ <include name="xsom.jar"/>
+ </fileset>
+ </path>
+
+ <path id="istack.cp">
+ <fileset dir="/usr/share/java" >
+ <include name="istack-commons-buildtools.jar"/>
+ <include name="codemodel.jar"/>
+ </fileset>
+ </path>
+
+ <taskdef name="resgen" classname="com.sun.istack.build.ResourceGenTask">
+ <classpath>
+ <path refid="istack.cp"/>
+ </classpath>
+ </taskdef>
+
<target name="prepare">
<mkdir dir="${build.dir}/classes/META-INF/services"/>
+ <mkdir dir="${build.dir}/gen-src"/>
<mkdir dir="${build.dir}/test-classes"/>
<mkdir dir="${build.dir}/test-reports"/>
</target>
<target name="generate-code" depends="prepare"
description="run all the code generators">
- <sequential>
- <exec executable="${mvn.exec}" failonerror="true" dir="${basedir}/src">
- <arg line="${mvn.extra.args}"/>
- <arg line="-DdestDir=../build/gen-src"/>
- <arg line="-Dresources=com/sun/tools/ws/resources/*.properties"/>
- <arg line="-Dlicense=../../../etc/CDDL+GPLv2.xml"/>
- <arg line="com.sun.istack:istack-commons-maven-plugin:2.12:rs-gen"/>
- </exec>
- </sequential>
+ <resgen destdir="${build.dir}/gen-src" encoding="UTF-8">
+ <resource dir="src" includes="com/sun/tools/ws/resources/*.properties"/>
+ </resgen>
</target>
<target name="compile" depends="generate-code">
- <javac srcdir="src:build/gen-src"
+ <javac srcdir="src:${build.dir}/gen-src"
destdir="${basedir}/build/classes"
debug="${compile.debug}"
deprecation="${compile.deprecation}"
optimize="${compile.optimize}"
source="1.5">
- <classpath refid="tools.compile.classpath"/>
+ <classpath>
+ <path refid="tools.compile.classpath"/>
+ <pathelement path="../../rt/build/classes" />
+ <fileset dir="../../build/lib" >
+ <include name="jaxws-rt.jar"/>
+ </fileset>
+ </classpath>
</javac>
<!-- Copy services -->
@@ -96,8 +128,17 @@
<path refid="tools.compile.classpath"/>
<pathelement path="${build.dir}/classes"/>
<pathelement path="${build.dir}/test-classes"/>
+ <pathelement path="../../rt/build/classes" />
<!-- so that resources can be found -->
<pathelement path="${basedir}/test"/>
+ <fileset dir="../../build/lib" >
+ <include name="jaxws-rt.jar"/>
+ </fileset>
+ <fileset dir="/usr/share/java" >
+ <include name="junit.jar"/>
+ <include name="stax-ex.jar"/>
+ <include name="xmlstreambuffer.jar"/>
+ </fileset>
</path>
