[jbossws-commits] JBossWS SVN: r4117 - in container/jboss40: trunk and 2 other directories.

jbossws-commits at lists.jboss.org jbossws-commits at lists.jboss.org
Thu Aug 2 12:53:25 EDT 2007


Author: thomas.diesler at jboss.com
Date: 2007-08-02 12:53:25 -0400 (Thu, 02 Aug 2007)
New Revision: 4117

Added:
   container/jboss40/trunk/
   container/jboss40/trunk/ant-import/build-thirdparty.xml
   container/jboss40/trunk/ant.properties.example
   container/jboss40/trunk/build.xml
   container/jboss40/trunk/version.properties
Removed:
   container/jboss40/trunk/ant-import/build-thirdparty.xml
   container/jboss40/trunk/build.xml
Modified:
   container/jboss40/trunk/.classpath
   container/jboss40/trunk/.project
   container/jboss40/trunk/src/main/java/org/jboss/wsf/container/jboss40/WebServiceClientDeployer.java
Log:
Initial commit

Copied: container/jboss40/trunk (from rev 4106, trunk/integration/jboss40)

Modified: container/jboss40/trunk/.classpath
===================================================================
--- trunk/integration/jboss40/.classpath	2007-08-02 15:05:43 UTC (rev 4106)
+++ container/jboss40/trunk/.classpath	2007-08-02 16:53:25 UTC (rev 4117)
@@ -3,15 +3,14 @@
 	<classpathentry excluding="org/jboss/wsf/container/jboss42/jms/" kind="src" path="src/main/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-4.0.x"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/integration-jboss42"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/jbossws-core"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/spi"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/integration-framework"/>
 	<classpathentry kind="lib" path="/integration-framework/thirdparty/dom4j.jar"/>
 	<classpathentry kind="lib" path="/integration-framework/thirdparty/jaxrpc-api.jar"/>
 	<classpathentry kind="lib" path="/integration-framework/thirdparty/jaxws-api.jar"/>
 	<classpathentry kind="lib" path="/integration-framework/thirdparty/jsr181-api.jar"/>
 	<classpathentry kind="lib" path="/integration-framework/thirdparty/saaj-api.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/common"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/container-jboss42"/>
 	<classpathentry kind="output" path="output/eclipse"/>
 </classpath>

Modified: container/jboss40/trunk/.project
===================================================================
--- trunk/integration/jboss40/.project	2007-08-02 15:05:43 UTC (rev 4106)
+++ container/jboss40/trunk/.project	2007-08-02 16:53:25 UTC (rev 4117)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>integration-jboss40</name>
+	<name>container-jboss40</name>
 	<comment></comment>
 	<projects>
 	</projects>

Deleted: container/jboss40/trunk/ant-import/build-thirdparty.xml
===================================================================
--- trunk/integration/jboss40/ant-import/build-thirdparty.xml	2007-08-02 15:05:43 UTC (rev 4106)
+++ container/jboss40/trunk/ant-import/build-thirdparty.xml	2007-08-02 16:53:25 UTC (rev 4117)
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!--                                                                        -->
-<!--  JBoss, the OpenSource J2EE webOS                                      -->
-<!--                                                                        -->
-<!--  Distributable under LGPL license.                                     -->
-<!--  See terms of license at http://www.gnu.org.                           -->
-<!--                                                                        -->
-<!-- ====================================================================== -->
-
-<!-- $Id$ -->
-
-<project>
-
-  <!-- ========= -->
-  <!-- Libraries -->
-  <!-- ========= -->
-
-  <target name="thirdparty" depends="thirdparty-get,thirdparty-classpath">
-  </target>
-  
-  <target name="thirdparty-init" depends="prepare"/>
-  
-  <!-- 
-    thirdpartry-get
-  -->
-  <target name="thirdparty-get" depends="thirdparty-init" 
-    description="Gets the thirdparty libraries"/>
-  
-  <target name="thirdparty-classpath" depends="thirdparty-get">
-    
-    <!-- The compile classpath for jboss40 integration -->
-    <path id="jbws40.integration.classpath">
-      <pathelement location="${core.dir}/output/lib/jbossws-core.jar"/>
-      <pathelement location="${framework.dir}/output/lib/jbossws-framework.jar"/>
-      <pathelement location="${framework.dir}/thirdparty/jbossws-common.jar"/>
-      <pathelement location="${framework.dir}/thirdparty/jbossws-spi.jar"/>
-      <pathelement location="${framework.dir}/thirdparty/jaxws-api.jar"/>
-      <pathelement location="${framework.dir}/thirdparty/jaxrpc-api.jar"/>
-      <pathelement location="${framework.dir}/thirdparty/jsr181-api.jar"/>
-      <pathelement location="${framework.dir}/thirdparty/saaj-api.jar"/>
-      <pathelement location="${jboss40.lib}/jboss-common.jar"/>
-      <pathelement location="${jboss40.lib}/jboss-jmx.jar"/>
-      <pathelement location="${jboss40.lib}/jboss-system.jar"/>
-      <pathelement location="${jboss40.lib}/jboss-xml-binding.jar"/>
-      <pathelement location="${jboss40.server.lib}/dom4j.jar"/>
-      <pathelement location="${jboss40.server.lib}/jboss.jar"/>
-      <pathelement location="${jboss40.server.lib}/jboss-j2ee.jar"/>
-      <pathelement location="${jboss40.server.lib}/jbosssx.jar"/>
-      <pathelement location="${jboss40.server.lib}/javax.servlet.jar"/>
-      <pathelement location="${jboss40.server.deploy}/jboss-aop-jdk50.deployer/jboss-aop-jdk50.jar"/>
-      <pathelement location="${jboss40.server.deploy}/jboss-bean.deployer/jboss-dependency.jar"/>
-      <pathelement location="${jboss40.server.deploy}/jboss-bean.deployer/jboss-microcontainer.jar"/>
-      <pathelement location="${jboss40.server.deploy}/ejb3.deployer/jboss-annotations-ejb3.jar"/>
-      <pathelement location="${jboss40.server.deploy}/ejb3.deployer/jboss-ejb3x.jar"/>
-      <pathelement location="${jboss40.server.deploy}/ejb3.deployer/jboss-ejb3.jar"/>
-    </path>
-
-  </target>
-
-</project>

Copied: container/jboss40/trunk/ant-import/build-thirdparty.xml (from rev 4109, trunk/integration/jboss40/ant-import/build-thirdparty.xml)
===================================================================
--- container/jboss40/trunk/ant-import/build-thirdparty.xml	                        (rev 0)
+++ container/jboss40/trunk/ant-import/build-thirdparty.xml	2007-08-02 16:53:25 UTC (rev 4117)
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!--                                                                        -->
+<!--  JBoss, the OpenSource J2EE webOS                                      -->
+<!--                                                                        -->
+<!--  Distributable under LGPL license.                                     -->
+<!--  See terms of license at http://www.gnu.org.                           -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<!-- $Id$ -->
+
+<project>
+
+  <!-- ========= -->
+  <!-- Libraries -->
+  <!-- ========= -->
+
+  <target name="thirdparty" depends="thirdparty-get,thirdparty-classpath">
+  </target>
+  
+  <target name="thirdparty-init" depends="prepare"/>
+  
+  <!-- 
+    thirdpartry-get
+  -->
+  <target name="thirdparty-get" depends="thirdparty-init" 
+    description="Gets the thirdparty libraries"/>
+  
+  <target name="thirdparty-classpath" depends="thirdparty-get">
+    
+    <!-- The compile classpath for jboss40 integration -->
+    <path id="jbws40.integration.classpath">
+      <pathelement location="${framework.dir}/output/lib/jbossws-framework.jar"/>
+      <pathelement location="${framework.dir}/thirdparty/jbossws-common.jar"/>
+      <pathelement location="${framework.dir}/thirdparty/jbossws-spi.jar"/>
+      <pathelement location="${framework.dir}/thirdparty/jaxws-api.jar"/>
+      <pathelement location="${framework.dir}/thirdparty/jaxrpc-api.jar"/>
+      <pathelement location="${framework.dir}/thirdparty/jsr181-api.jar"/>
+      <pathelement location="${framework.dir}/thirdparty/saaj-api.jar"/>
+      <pathelement location="${jboss40.lib}/jboss-common.jar"/>
+      <pathelement location="${jboss40.lib}/jboss-jmx.jar"/>
+      <pathelement location="${jboss40.lib}/jboss-system.jar"/>
+      <pathelement location="${jboss40.lib}/jboss-xml-binding.jar"/>
+      <pathelement location="${jboss40.server.lib}/dom4j.jar"/>
+      <pathelement location="${jboss40.server.lib}/jboss.jar"/>
+      <pathelement location="${jboss40.server.lib}/jboss-j2ee.jar"/>
+      <pathelement location="${jboss40.server.lib}/jbosssx.jar"/>
+      <pathelement location="${jboss40.server.lib}/javax.servlet.jar"/>
+      <pathelement location="${jboss40.server.deploy}/jboss-aop-jdk50.deployer/jboss-aop-jdk50.jar"/>
+      <pathelement location="${jboss40.server.deploy}/jboss-bean.deployer/jboss-dependency.jar"/>
+      <pathelement location="${jboss40.server.deploy}/jboss-bean.deployer/jboss-microcontainer.jar"/>
+      <pathelement location="${jboss40.server.deploy}/ejb3.deployer/jboss-annotations-ejb3.jar"/>
+      <pathelement location="${jboss40.server.deploy}/ejb3.deployer/jboss-ejb3x.jar"/>
+      <pathelement location="${jboss40.server.deploy}/ejb3.deployer/jboss-ejb3.jar"/>
+    </path>
+
+  </target>
+
+</project>

Added: container/jboss40/trunk/ant.properties.example
===================================================================
--- container/jboss40/trunk/ant.properties.example	                        (rev 0)
+++ container/jboss40/trunk/ant.properties.example	2007-08-02 16:53:25 UTC (rev 4117)
@@ -0,0 +1,26 @@
+#
+# A sample ant properties file
+#
+# $Id: ant.properties.example 3995 2007-07-26 08:52:45Z thomas.diesler at jboss.com $
+
+# JBoss Home
+#jboss40.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_0_5_GA/build/output/jboss-4.0.5.GA-ejb3
+
+# The JBoss settings
+jboss.server.instance=default
+
+# JBoss Repository
+#jboss.repository=file:/home/tdiesler/svn/jboss.local.repository
+jboss.repository=http://repository.jboss.org
+
+# JBossWS Release
+jboss.local.repository=/home/tdiesler/svn/jboss.local.repository
+
+# Force thirdparty HTTP get
+#force.thirdparty.get=true
+
+# Java Compiler options
+javac.debug=yes
+javac.deprecation=no
+javac.fail.onerror=yes
+javac.verbose=no

Deleted: container/jboss40/trunk/build.xml
===================================================================
--- trunk/integration/jboss40/build.xml	2007-08-02 15:05:43 UTC (rev 4106)
+++ container/jboss40/trunk/build.xml	2007-08-02 16:53:25 UTC (rev 4117)
@@ -1,168 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!--                                                                        -->
-<!--  JBoss, the OpenSource J2EE webOS                                      -->
-<!--                                                                        -->
-<!--  Distributable under LGPL license.                                     -->
-<!--  See terms of license at http://www.gnu.org.                           -->
-<!--                                                                        -->
-<!-- ====================================================================== -->
-
-<!-- $Id$ -->
-
-<project default="main" basedir="../.." name="JBossWS-JBoss40">
-  
-  <import file="${basedir}/build/ant-import/build-setup.xml"/>
-  
-  <import file="${int.jboss40.dir}/ant-import/build-release.xml"/>
-  <import file="${int.jboss40.dir}/ant-import/build-thirdparty.xml"/>
-  
-  <!-- ================================================================== -->
-  <!-- Setup                                                              -->
-  <!-- ================================================================== -->
-  
-  <property name="jbws40.dir" value="${int.jboss40.dir}"/>
-  <property name="jbws40.src.dir" value="${jbws40.dir}/src/main"/>
-  <property name="jbws40.etc.dir" value="${jbws40.src.dir}/etc"/>
-  <property name="jbws40.java.dir" value="${jbws40.src.dir}/java"/>
-  <property name="jbws40.resources.dir" value="${jbws40.src.dir}/resources"/>
-  <property name="jbws40.output.dir" value="${jbws40.dir}/output"/>
-  <property name="jbws40.output.apidocs.dir" value="${jbws40.output.dir}/apidocs"/>
-  <property name="jbws40.output.classes.dir" value="${jbws40.output.dir}/classes"/>
-  <property name="jbws40.output.etc.dir" value="${jbws40.output.dir}/etc"/>
-  <property name="jbws40.output.lib.dir" value="${jbws40.output.dir}/lib"/>
-
-  <property name="jbws42.dir" value="${int.jboss42.dir}"/>
-  <property name="jbws42.src.dir" value="${jbws42.dir}/src/main"/>
-  <property name="jbws42.etc.dir" value="${jbws42.src.dir}/etc"/>
-  <property name="jbws42.java.dir" value="${jbws42.src.dir}/java"/>
-  <property name="jbws42.resources.dir" value="${jbws42.src.dir}/resources"/>
-
-  <!-- ================================================================== -->
-  <!-- Initialization                                                     -->
-  <!-- ================================================================== -->
-  
-  <target name="init" depends="prepare, thirdparty">
-    <fail message="Not available: ${jboss40.available.file}" unless="jboss40.available"/>
-    <ant antfile="${core.dir}/build.xml" target="jars" inheritall="false"/>
-  </target>
-  
-  <!-- ================================================================== -->
-  <!-- Compile                                                            -->
-  <!-- ================================================================== -->
-  
-  <!--
-  | Compile everything.
-  |
-  | This target should depend on other compile-* targets for each
-  | different type of compile that needs to be performed, short of
-  | documentation compiles.
-  -->
-  
-  <target name="compile" depends="init,compile-classes,compile-etc" description="Compile all source files."/>
-  
-  <!-- Compile integration java sources -->
-  <target name="compile-classes" depends="init">
-    <mkdir dir="${jbws40.output.classes.dir}"/>
-    <javac srcdir="${jbws40.java.dir}" sourcepath="" destdir="${jbws40.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}"
-      deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}">
-      <src path="${jbws40.java.dir}"/>
-      <src path="${jbws42.java.dir}"/>
-      <include name="org/jboss/ws/integration/**"/>
-      <include name="org/jboss/wsf/container/jboss40/**"/>
-      <include name="org/jboss/wsf/container/jboss42/**"/>
-      <exclude name="org/jboss/wsf/container/jboss42/jms/**"/>
-      <exclude name="org/jboss/wsf/container/jboss42/EJBArchiveMetaDataAdapterEJB21.java"/>
-      <exclude name="org/jboss/wsf/container/jboss42/InvocationHandlerEJB3.java"/>
-      <exclude name="org/jboss/wsf/container/jboss42/InvocationHandlerFactoryImpl.java"/>
-      <classpath refid="jbws40.integration.classpath"/>
-    </javac>
-  </target>
-  
-  <!-- Compile etc files (manifests and such) -->
-  <target name="compile-etc" depends="init">
-    <mkdir dir="${jbws40.output.etc.dir}"/>
-    <copy todir="${jbws40.output.etc.dir}" filtering="yes">
-      <fileset dir="${build.dir}/etc">
-        <include name="default.mf"/>
-  	  </fileset>
-      <filterset>
-        <filter token="java.vm.version" value="${java.vm.version}"/>
-        <filter token="java.vm.vendor" value="${java.vm.vendor}"/>
-        <filter token="build.id" value="${build.id}"/>
-        <filter token="implementation.version" value="jbossws-${version.id}"/>
-        <filtersfile file="${build.dir}/version.properties"/>
-      </filterset>
-    </copy>
-  </target>
-  
-  <!-- ================================================================== -->
-  <!-- Archives                                                           -->
-  <!-- ================================================================== -->
-  
-  <!--
-  | Build all jar files.
-  -->
-  <target name="jars"  depends="compile,module-jars" description="Builds all jar files.">
-  </target>
-  
-  <!--
-  |  Build all jar files.
-  -->
-  <target name="module-jars" depends="init">
-    
-    <!-- Build jbossws-jboss40.jar -->
-    <mkdir dir="${jbws40.output.lib.dir}"/>
-    <jar jarfile="${jbws40.output.lib.dir}/jbossws-jboss40.jar" manifest="${jbws40.output.etc.dir}/default.mf">
-      <fileset dir="${jbws40.output.classes.dir}">
-        <include name="org/jboss/ws/integration/**"/>
-        <include name="org/jboss/wsf/container/jboss40/**"/>
-        <include name="org/jboss/wsf/container/jboss42/**"/>
-      </fileset>
-      <metainf dir="${jbws40.resources.dir}/jbossws-jboss40.jar/META-INF"/>
-    </jar>
-    
-    <!-- Build jbossws40-src.zip -->
-    <zip zipfile="${jbws40.output.lib.dir}/jbossws-jboss40-src.zip" >
-      <fileset dir="${jbws40.java.dir}"/>
-      <fileset dir="${jbws42.java.dir}"/>
-    </zip>
-    
-  </target>
-
-	<!-- Generate the JavaDoc -->
-   <target name="javadoc" depends="init" description="Generate the Javadoc">
-
-		<mkdir dir="${jbws40.output.apidocs.dir}"/>
-      <javadoc destdir="${jbws40.output.apidocs.dir}" author="true" version="true" use="true" windowtitle="JBossWS API">
-         <classpath>
-				<path refid="jbws40.integration.classpath"/>				
-			</classpath>
-         <packageset dir="${jbws40.java.dir}" defaultexcludes="yes">
-            <include name="org/jboss/wsf/**"/>
-         </packageset>
-         <doctitle><![CDATA[<h1>JBoss Web Service Framework - Container integration AS 4.0</h1>]]></doctitle>
-         <tag name="todo" scope="all" description="To do:"/>
-		</javadoc>
-   </target>
-
-  <!-- ================================================================== -->
-  <!-- Miscellaneous                                                       -->
-  <!-- ================================================================== -->
-  
-  <target name="clean" depends="prepare" description="Cleans up most generated files.">
-    <delete dir="${jbws40.output.dir}"/>
-  </target>
-  
-  <target name="clobber" depends="clean" description="Cleans up all generated files.">
-  </target>
-  
-  <target name="main" description="Executes the default target (most)." depends="most"/>
-  
-  <target name="most" description="Builds almost everything." depends="jars"/>
-  
-  <target name="all" description="Create a distribution zip file" depends="main">
-  </target>
-  
-</project>

Copied: container/jboss40/trunk/build.xml (from rev 4109, trunk/integration/jboss40/build.xml)
===================================================================
--- container/jboss40/trunk/build.xml	                        (rev 0)
+++ container/jboss40/trunk/build.xml	2007-08-02 16:53:25 UTC (rev 4117)
@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!--                                                                        -->
+<!--  JBoss, the OpenSource J2EE webOS                                      -->
+<!--                                                                        -->
+<!--  Distributable under LGPL license.                                     -->
+<!--  See terms of license at http://www.gnu.org.                           -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<!-- $Id$ -->
+
+<project default="main" basedir="." name="JBossWS-JBoss40">
+  
+  <import file="${basedir}/ant-import/build-setup.xml"/>
+  <import file="${basedir}/ant-import/build-release.xml"/>
+  <import file="${basedir}/ant-import/build-thirdparty.xml"/>
+  
+  <!-- ================================================================== -->
+  <!-- Setup                                                              -->
+  <!-- ================================================================== -->
+  
+  <property name="jbws40.dir" value="${int.jboss40.dir}"/>
+  <property name="jbws40.src.dir" value="${jbws40.dir}/src/main"/>
+  <property name="jbws40.etc.dir" value="${jbws40.src.dir}/etc"/>
+  <property name="jbws40.java.dir" value="${jbws40.src.dir}/java"/>
+  <property name="jbws40.resources.dir" value="${jbws40.src.dir}/resources"/>
+  <property name="jbws40.output.dir" value="${jbws40.dir}/output"/>
+  <property name="jbws40.output.apidocs.dir" value="${jbws40.output.dir}/apidocs"/>
+  <property name="jbws40.output.classes.dir" value="${jbws40.output.dir}/classes"/>
+  <property name="jbws40.output.etc.dir" value="${jbws40.output.dir}/etc"/>
+  <property name="jbws40.output.lib.dir" value="${jbws40.output.dir}/lib"/>
+
+  <property name="jbws42.dir" value="${int.jboss42.dir}"/>
+  <property name="jbws42.src.dir" value="${jbws42.dir}/src/main"/>
+  <property name="jbws42.etc.dir" value="${jbws42.src.dir}/etc"/>
+  <property name="jbws42.java.dir" value="${jbws42.src.dir}/java"/>
+  <property name="jbws42.resources.dir" value="${jbws42.src.dir}/resources"/>
+
+  <!-- ================================================================== -->
+  <!-- Initialization                                                     -->
+  <!-- ================================================================== -->
+  
+  <target name="init" depends="prepare, thirdparty">
+    <fail message="Not available: ${jboss40.available.file}" unless="jboss40.available"/>
+  </target>
+  
+  <!-- ================================================================== -->
+  <!-- Compile                                                            -->
+  <!-- ================================================================== -->
+  
+  <!--
+  | Compile everything.
+  |
+  | This target should depend on other compile-* targets for each
+  | different type of compile that needs to be performed, short of
+  | documentation compiles.
+  -->
+  
+  <target name="compile" depends="init,compile-classes,compile-etc" description="Compile all source files."/>
+  
+  <!-- Compile integration java sources -->
+  <target name="compile-classes" depends="init">
+    <mkdir dir="${jbws40.output.classes.dir}"/>
+    <javac srcdir="${jbws40.java.dir}" sourcepath="" destdir="${jbws40.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}"
+      deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}">
+      <src path="${jbws40.java.dir}"/>
+      <src path="${jbws42.java.dir}"/>
+      <include name="org/jboss/ws/integration/**"/>
+      <include name="org/jboss/wsf/container/jboss40/**"/>
+      <include name="org/jboss/wsf/container/jboss42/**"/>
+      <exclude name="org/jboss/wsf/container/jboss42/jms/**"/>
+      <exclude name="org/jboss/wsf/container/jboss42/EJBArchiveMetaDataAdapterEJB21.java"/>
+      <exclude name="org/jboss/wsf/container/jboss42/InvocationHandlerEJB3.java"/>
+      <exclude name="org/jboss/wsf/container/jboss42/InvocationHandlerFactoryImpl.java"/>
+      <classpath refid="jbws40.integration.classpath"/>
+    </javac>
+  </target>
+  
+  <!-- Compile etc files (manifests and such) -->
+  <target name="compile-etc" depends="init">
+    <mkdir dir="${jbws40.output.etc.dir}"/>
+    <copy todir="${jbws40.output.etc.dir}" filtering="yes">
+      <fileset dir="${build.dir}/etc">
+        <include name="default.mf"/>
+  	  </fileset>
+      <filterset>
+        <filter token="java.vm.version" value="${java.vm.version}"/>
+        <filter token="java.vm.vendor" value="${java.vm.vendor}"/>
+        <filter token="build.id" value="${build.id}"/>
+        <filter token="implementation.version" value="jbossws-${version.id}"/>
+        <filtersfile file="${build.dir}/version.properties"/>
+      </filterset>
+    </copy>
+  </target>
+  
+  <!-- ================================================================== -->
+  <!-- Archives                                                           -->
+  <!-- ================================================================== -->
+  
+  <!--
+  | Build all jar files.
+  -->
+  <target name="jars"  depends="compile,module-jars" description="Builds all jar files.">
+  </target>
+  
+  <!--
+  |  Build all jar files.
+  -->
+  <target name="module-jars" depends="init">
+    
+    <!-- Build jbossws-jboss40.jar -->
+    <mkdir dir="${jbws40.output.lib.dir}"/>
+    <jar jarfile="${jbws40.output.lib.dir}/jbossws-jboss40.jar" manifest="${jbws40.output.etc.dir}/default.mf">
+      <fileset dir="${jbws40.output.classes.dir}">
+        <include name="org/jboss/ws/integration/**"/>
+        <include name="org/jboss/wsf/container/jboss40/**"/>
+        <include name="org/jboss/wsf/container/jboss42/**"/>
+      </fileset>
+      <metainf dir="${jbws40.resources.dir}/jbossws-jboss40.jar/META-INF"/>
+    </jar>
+    
+    <!-- Build jbossws40-src.zip -->
+    <zip zipfile="${jbws40.output.lib.dir}/jbossws-jboss40-src.zip" >
+      <fileset dir="${jbws40.java.dir}"/>
+      <fileset dir="${jbws42.java.dir}"/>
+    </zip>
+    
+  </target>
+
+	<!-- Generate the JavaDoc -->
+   <target name="javadoc" depends="init" description="Generate the Javadoc">
+
+		<mkdir dir="${jbws40.output.apidocs.dir}"/>
+      <javadoc destdir="${jbws40.output.apidocs.dir}" author="true" version="true" use="true" windowtitle="JBossWS API">
+         <classpath>
+				<path refid="jbws40.integration.classpath"/>				
+			</classpath>
+         <packageset dir="${jbws40.java.dir}" defaultexcludes="yes">
+            <include name="org/jboss/wsf/**"/>
+         </packageset>
+         <doctitle><![CDATA[<h1>JBoss Web Service Framework - Container integration AS 4.0</h1>]]></doctitle>
+         <tag name="todo" scope="all" description="To do:"/>
+		</javadoc>
+   </target>
+
+  <!-- ================================================================== -->
+  <!-- Miscellaneous                                                       -->
+  <!-- ================================================================== -->
+  
+  <target name="clean" depends="prepare" description="Cleans up most generated files.">
+    <delete dir="${jbws40.output.dir}"/>
+  </target>
+  
+  <target name="clobber" depends="clean" description="Cleans up all generated files.">
+    <delete dir="${jbws40.dir}/thirdparty"/>
+  </target>
+  
+  <target name="main" description="Executes the default target (most)." depends="most"/>
+  
+  <target name="most" description="Builds almost everything." depends="jars"/>
+  
+  <target name="all" description="Create a distribution zip file" depends="main">
+  </target>
+  
+</project>

Modified: container/jboss40/trunk/src/main/java/org/jboss/wsf/container/jboss40/WebServiceClientDeployer.java
===================================================================
--- trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/WebServiceClientDeployer.java	2007-08-02 15:05:43 UTC (rev 4106)
+++ container/jboss40/trunk/src/main/java/org/jboss/wsf/container/jboss40/WebServiceClientDeployer.java	2007-08-02 16:53:25 UTC (rev 4117)
@@ -34,8 +34,8 @@
 import org.jboss.deployment.DeploymentInfo;
 import org.jboss.system.ServiceMBeanSupport;
 import org.jboss.webservice.metadata.serviceref.ServiceRefMetaData;
-import org.jboss.wsf.framework.deployment.ResourceLoaderAdapter;
-import org.jboss.wsf.framework.deployment.URLLoaderAdapter;
+import org.jboss.wsf.common.ResourceLoaderAdapter;
+import org.jboss.wsf.common.URLLoaderAdapter;
 import org.jboss.wsf.spi.SPIProvider;
 import org.jboss.wsf.spi.SPIProviderResolver;
 import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;

Added: container/jboss40/trunk/version.properties
===================================================================
--- container/jboss40/trunk/version.properties	                        (rev 0)
+++ container/jboss40/trunk/version.properties	2007-08-02 16:53:25 UTC (rev 4117)
@@ -0,0 +1,20 @@
+
+# $Id: version.properties 3956 2007-07-19 18:03:54Z thomas.diesler at jboss.com $
+
+specification.title=JBossWS
+specification.vendor=JBoss (http://www.jboss.org)
+specification.version=jbossws-2.0
+
+version.id=2.0.1.CR1
+repository.id=2.0.1.CR1
+
+implementation.title=JBoss Web Services - Integration JBoss40 
+implementation.url=http://www.jboss.org/products/jbossws
+implementation.vendor=JBoss Inc.
+implementation.vendor.id=http://www.jboss.org
+
+# Thirdparty library versions
+jbossws-common=2.0.1.CR1
+jbossws-spi=2.0.1.CR1
+sun-jaxrpc=1.1
+sun-jaxws=2.1.1
\ No newline at end of file




More information about the jbossws-commits mailing list