[jboss-svn-commits] JBossWS SVN: r769 - in branches/jbossws-1.0: . src/main/etc src/main/java/javax/xml/ws
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Aug 18 08:29:18 EDT 2006
Author: thomas.diesler at jboss.com
Date: 2006-08-18 08:29:05 -0400 (Fri, 18 Aug 2006)
New Revision: 769
Removed:
branches/jbossws-1.0/src/main/java/javax/xml/ws/handler/
branches/jbossws-1.0/src/main/java/javax/xml/ws/http/
branches/jbossws-1.0/src/main/java/javax/xml/ws/soap/
branches/jbossws-1.0/src/main/java/javax/xml/ws/spi/
Modified:
branches/jbossws-1.0/build-thirdparty.xml
branches/jbossws-1.0/build.xml
branches/jbossws-1.0/src/main/etc/jbossws-component-info.xml
branches/jbossws-1.0/src/main/etc/jbossws14-component-info.xml
branches/jbossws-1.0/version.properties
Log:
build jaxrpc, saaj, jaxws jars
Modified: branches/jbossws-1.0/build-thirdparty.xml
===================================================================
--- branches/jbossws-1.0/build-thirdparty.xml 2006-08-18 12:25:11 UTC (rev 768)
+++ branches/jbossws-1.0/build-thirdparty.xml 2006-08-18 12:29:05 UTC (rev 769)
@@ -91,7 +91,6 @@
<!-- The classpath for the jbossws core -->
<path id="jboss.core.classpath">
<pathelement location="${thirdparty.dir}/jboss-j2ee.jar"/>
- <pathelement location="${jboss.server.lib}/jboss-jaxrpc.jar"/>
<pathelement location="${jboss.server.deploy}/ejb3.deployer/jboss-annotations-ejb3.jar"/>
</path>
Modified: branches/jbossws-1.0/build.xml
===================================================================
--- branches/jbossws-1.0/build.xml 2006-08-18 12:25:11 UTC (rev 768)
+++ branches/jbossws-1.0/build.xml 2006-08-18 12:29:05 UTC (rev 769)
@@ -27,7 +27,7 @@
<property environment="env"/>
<property name="build.dir" value="${basedir}/output"/>
<property name="build.classes.dir" value="${build.dir}/classes"/>
- <property name="build.retro.dir" value="${build.dir}/classes14"/>
+ <property name="build.classes14.dir" value="${build.dir}/classes14"/>
<property name="build.etc.dir" value="${build.dir}/etc"/>
<property name="build.lib.dir" value="${build.dir}/lib"/>
<property name="build.resources.dir" value="${build.dir}/resources"/>
@@ -118,16 +118,31 @@
<target name="compile" depends="init,compile-classes,compile-etc,compile-resources" description="Compile all source files."/>
<!-- Compile java sources -->
- <target name="compile-classes" depends="compile-core,compile-integration"/>
+ <target name="compile-classes" depends="compile-interfaces,compile-core,compile-integration"/>
<!-- Compile core java sources -->
+ <target name="compile-interfaces" depends="init">
+ <mkdir dir="${build.classes14.dir}"/>
+ <javac srcdir="${src.java.dir}" destdir="${build.classes14.dir}" debug="${javac.debug}" verbose="${javac.verbose}"
+ deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}" source="1.4" target="1.4">
+ <include name="javax/xml/rpc/**"/>
+ <include name="javax/xml/soap/**"/>
+ <classpath refid="core.classpath"/>
+ </javac>
+ </target>
+
+ <!-- Compile core java sources -->
<target name="compile-core" depends="init">
<mkdir dir="${build.classes.dir}"/>
<javac srcdir="${src.java.dir}" destdir="${build.classes.dir}" debug="${javac.debug}" verbose="${javac.verbose}"
deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}">
+ <include name="javax/xml/ws/**"/>
+ <include name="javax/jws/**"/>
+ <include name="org/jboss/ws/**"/>
<exclude name="org/jboss/ws/integration/**"/>
<exclude name="org/jboss/ws/transport/jms/**"/>
<exclude name="org/jboss/ws/server/ServiceEndpointInterceptor.java"/>
+ <classpath location="build.classes14.dir"/>
<classpath refid="core.classpath"/>
</javac>
</target>
@@ -140,6 +155,7 @@
<include name="org/jboss/ws/integration/**"/>
<include name="org/jboss/ws/transport/jms/**"/>
<include name="org/jboss/ws/server/ServiceEndpointInterceptor.java"/>
+ <classpath location="build.classes14.dir"/>
<classpath refid="integration.classpath"/>
</javac>
</target>
@@ -182,11 +198,35 @@
-->
<target name="module-jars">
+ <!-- Build jboss-jaxrpc.jar -->
+ <mkdir dir="${build.lib.dir}"/>
+ <jar jarfile="${build.lib.dir}/jboss-jaxrpc.jar" manifest="${build.etc.dir}/default.mf">
+ <fileset dir="${build.classes14.dir}">
+ <include name="javax/xml/rpc/**"/>
+ </fileset>
+ </jar>
+
+ <!-- Build jboss-saaj.jar -->
+ <mkdir dir="${build.lib.dir}"/>
+ <jar jarfile="${build.lib.dir}/jboss-saaj.jar" manifest="${build.etc.dir}/default.mf">
+ <fileset dir="${build.classes14.dir}">
+ <include name="javax/xml/soap/**"/>
+ </fileset>
+ </jar>
+
+ <!-- Build jboss-jaxws.jar -->
+ <mkdir dir="${build.lib.dir}"/>
+ <jar jarfile="${build.lib.dir}/jboss-jaxws.jar" manifest="${build.etc.dir}/default.mf">
+ <fileset dir="${build.classes.dir}">
+ <include name="javax/jws/**"/>
+ <include name="javax/xml/ws/**"/>
+ </fileset>
+ </jar>
+
<!-- Build jbossws-core.jar -->
<mkdir dir="${build.lib.dir}"/>
<jar jarfile="${build.lib.dir}/jbossws-core.jar" manifest="${build.etc.dir}/default.mf">
<fileset dir="${build.classes.dir}">
- <include name="javax/**"/>
<include name="org/jboss/ws/**"/>
<exclude name="org/jboss/ws/integration/**"/>
<exclude name="org/jboss/ws/transport/jms/**"/>
@@ -277,6 +317,9 @@
<include name="jbossws-jboss-integration.jar"/>
<include name="jbossws-context.war"/>
<include name="jbossws-core.jar"/>
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-saaj.jar"/>
<include name="jbossws.beans"/>
</fileset>
<fileset dir="${thirdparty.dir}">
@@ -300,11 +343,19 @@
<target name="module-jars14" depends="jbossretro">
+ <!-- Build jboss-jaxws14.jar -->
+ <mkdir dir="${build.lib.dir}"/>
+ <jar jarfile="${build.lib.dir}/jboss-jaxws14.jar" manifest="${build.etc.dir}/default.mf">
+ <fileset dir="${build.classes14.dir}">
+ <include name="javax/jws/**"/>
+ <include name="javax/xml/ws/**"/>
+ </fileset>
+ </jar>
+
<!-- Build jbossws14-core.jar -->
<mkdir dir="${build.lib.dir}"/>
<jar jarfile="${build.lib.dir}/jbossws14-core.jar" manifest="${build.etc.dir}/default.mf">
- <fileset dir="${build.retro.dir}">
- <include name="javax/**"/>
+ <fileset dir="${build.classes14.dir}">
<include name="org/jboss/ws/**"/>
<exclude name="org/jboss/ws/integration/**"/>
<exclude name="org/jboss/ws/transport/jms/**"/>
@@ -318,7 +369,7 @@
<!-- Build jbossws-jboss-integration.jar -->
<jar jarfile="${build.lib.dir}/jbossws14-jboss-integration.jar" manifest="${build.etc.dir}/default.mf">
- <fileset dir="${build.retro.dir}">
+ <fileset dir="${build.classes14.dir}">
<include name="org/jboss/ws/integration/*.class"/>
<include name="org/jboss/ws/integration/jboss/**"/>
<include name="org/jboss/ws/transport/jms/**"/>
@@ -328,7 +379,7 @@
<!-- Build jbossws14-client.jar -->
<jar jarfile="${build.lib.dir}/jbossws14-client.jar" manifest="${build.etc.dir}/default.mf">
- <fileset dir="${build.retro.dir}">
+ <fileset dir="${build.classes14.dir}">
<include name="javax/**"/>
<include name="org/jboss/ws/**"/>
<exclude name="org/jboss/ws/integration/jboss/**"/>
@@ -354,6 +405,9 @@
<fileset dir="${build.lib.dir}">
<include name="jbossws14-jboss-integration.jar"/>
<include name="jbossws14-core.jar"/>
+ <include name="jbossws-jaxrpc.jar"/>
+ <include name="jbossws-jaxws14.jar"/>
+ <include name="jbossws-saaj.jar"/>
<include name="jbossws-context.war"/>
<include name="jbossws.beans"/>
</fileset>
@@ -386,9 +440,9 @@
</classpath>
</taskdef>
- <mkdir dir="${build.retro.dir}"/>
+ <mkdir dir="${build.classes14.dir}"/>
- <retro destdir="${build.retro.dir}">
+ <retro destdir="${build.classes14.dir}">
<classpath>
<pathelement location="${thirdparty.dir}/javassist.jar"/>
<pathelement location="${thirdparty.dir}/jbossretro.jar"/>
@@ -401,7 +455,7 @@
<src path="${build.classes.dir}"/>
</retro>
- <copy todir="${build.retro.dir}">
+ <copy todir="${build.classes14.dir}">
<fileset dir="${build.resources.dir}">
<include name="schema/**"/>
<include name="dtd/**"/>
@@ -494,8 +548,6 @@
<!-- Build jbossws-thirdparty.jar -->
<mkdir dir="${build.lib.dir}/build"/>
<unjar dest="${build.lib.dir}/build" src="${jboss.lib}/jboss-common.jar"/>
- <unjar dest="${build.lib.dir}/build" src="${jboss.server.lib}/jboss-jaxrpc.jar"/>
- <unjar dest="${build.lib.dir}/build" src="${jboss.server.lib}/jboss-saaj.jar"/>
<unjar dest="${build.lib.dir}/build" src="${jboss.server.lib}/jboss-j2ee.jar"/>
<unjar dest="${build.lib.dir}/build" src="${thirdparty.dir}/jboss-container.jar"/>
<unjar dest="${build.lib.dir}/build" src="${thirdparty.dir}/jboss-dependency.jar"/>
@@ -526,6 +578,9 @@
<fileset dir="${build.lib.dir}">
<include name="jbossws.sar"/>
<include name="jbossws-client.jar"/>
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-saaj.jar"/>
</fileset>
</copy>
<copy tofile="${jbossws.dir}/component-info.xml" file="${src.etc.dir}/jbossws-component-info.xml" filtering="true" overwrite="true">
@@ -541,6 +596,9 @@
<fileset dir="${build.lib.dir}">
<include name="jbossws14.sar"/>
<include name="jbossws14-client.jar"/>
+ <include name="jboss-jaxws14.jar"/>
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-saaj.jar"/>
</fileset>
</copy>
<copy tofile="${jbossws14.dir}/component-info.xml" file="${src.etc.dir}/jbossws14-component-info.xml" filtering="true" overwrite="true">
Modified: branches/jbossws-1.0/src/main/etc/jbossws-component-info.xml
===================================================================
--- branches/jbossws-1.0/src/main/etc/jbossws-component-info.xml 2006-08-18 12:25:11 UTC (rev 768)
+++ branches/jbossws-1.0/src/main/etc/jbossws-component-info.xml 2006-08-18 12:29:05 UTC (rev 769)
@@ -7,6 +7,9 @@
<artifact id="jbossws.sar"/>
<artifact id="jbossws-client.jar"/>
+ <artifact id="jboss-jaxrpc.jar"/>
+ <artifact id="jboss-jaxws.jar"/>
+ <artifact id="jboss-saaj.jar"/>
<import componentref="apache-xmlsec">
<compatible version="@apache-xmlsec@"/>
@@ -27,6 +30,9 @@
<export>
<include input="jbossws.sar"/>
<include input="jbossws-client.jar"/>
+ <include input="jboss-jaxrpc.jar"/>
+ <include input="jboss-jaxws.jar"/>
+ <include input="jboss-saaj.jar"/>
</export>
</component>
Modified: branches/jbossws-1.0/src/main/etc/jbossws14-component-info.xml
===================================================================
--- branches/jbossws-1.0/src/main/etc/jbossws14-component-info.xml 2006-08-18 12:25:11 UTC (rev 768)
+++ branches/jbossws-1.0/src/main/etc/jbossws14-component-info.xml 2006-08-18 12:29:05 UTC (rev 769)
@@ -7,6 +7,9 @@
<artifact id="jbossws14.sar"/>
<artifact id="jbossws14-client.jar"/>
+ <artifact id="jboss-jaxws14.jar"/>
+ <artifact id="jboss-jaxrpc.jar"/>
+ <artifact id="jboss-saaj.jar"/>
<import componentref="apache-xmlsec">
<compatible version="@apache-xmlsec@"/>
@@ -23,13 +26,16 @@
<import componentref="jboss/remoting">
<compatible version="@jboss-remoting@"/>
</import>
- <import componentref="jboss/jbossretro">
+ <import componentref="jboss/jbossretro-rt">
<compatible version="@jboss-jbossretro@"/>
</import>
<export>
<include input="jbossws14.sar"/>
<include input="jbossws14-client.jar"/>
+ <include input="jboss-jaxws14.jar"/>
+ <include input="jboss-jaxrpc.jar"/>
+ <include input="jboss-saaj.jar"/>
</export>
</component>
Modified: branches/jbossws-1.0/version.properties
===================================================================
--- branches/jbossws-1.0/version.properties 2006-08-18 12:25:11 UTC (rev 768)
+++ branches/jbossws-1.0/version.properties 2006-08-18 12:29:05 UTC (rev 769)
@@ -3,7 +3,7 @@
specification.vendor=JBoss (http://www.jboss.org)
specification.version=jbossws-1.0
-version.id=1.0.3.DEV
+version.id=snapshot
implementation.title=JBoss Web Services (JBossWS)
implementation.url=http://www.jboss.org/products/jbossws
@@ -13,7 +13,7 @@
# thirdparty library versions that are referenced in component-info.xml
apache-xmlsec=1.3.0
ibm-wsdl4j=1.5.2jboss
-javassist=3.2.0.CR2
+javassist=3.3.0.GA
jboss-jbossxb=1.0.0.CR6
jboss-microcontainer=1.0.2
jboss-remoting=1.4.3.GA
@@ -24,7 +24,7 @@
apache-xalan=j_2.7.0
apache-xerces=2.7.1
jboss-backport-concurrent=2.1.0.GA
-jboss-jbossretro=1.0.0.GA
+jboss-jbossretro=1.0.2.GA
jbossas-core=4.0.4.GA
junit=3.8.1
oswego-concurrent=1.3.4
More information about the jboss-svn-commits
mailing list