- Add the factories for ws.

- Submitted by Fabien Carrion.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@525532 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/build.properties.default b/build.properties.default
index b95a9f9..492a735 100644 (file)
--- a/build.properties.default
+++ b/build.properties.default
@@ -34,6 +34,10 @@ base-tomcat.loc=http://archive.apache.org/dist/tomcat
 # ----- Commons Logging, version 1.1 or later -----
 commons-logging-src.loc=${base-jakarta.loc}/commons/logging/source/commons-logging-1.1-src.tar.gz
 
+# ----- Webservices -----
+jaxrpc-src.loc=http://repo1.maven.org/maven2/geronimo-spec/geronimo-spec-jaxrpc/1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar
+wsdl4j-src.loc=http://repo1.maven.org/maven2/wsdl4j/wsdl4j/1.6.1/wsdl4j-1.6.1.jar
+
 # ----- Eclipse JDT, version 3.2 or later -----
 jdt.home=${base.path}/eclipse/plugins
 jdt.lib=${jdt.home}

diff --git a/build.xml b/build.xml
index 1d7b28e..d2c7c95 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -95,6 +95,7 @@
 <!-- Comment this in to show unchecked warnings:     <compilerarg value="-Xlint:unchecked"/> -->
       <classpath refid="tomcat.classpath" />
       <exclude name="org/apache/tomcat/util/net/puretls/**" />
+      <exclude name="org/apache/naming/factory/webservices/**" />
     </javac>
     <tstamp>
       <format property="TODAY" pattern="MMM d yyyy" locale="en"/>
@@ -213,6 +214,7 @@
         <exclude name="org/apache/catalina/tribes/**" />
         <exclude name="org/apache/catalina/launcher/**" />
         <exclude name="org/apache/catalina/storeconfig/**" />
+        <exclude name="org/apache/naming/factory/webservices/**" />
       </fileset>
     </jar>
     

diff --git a/extras.xml b/extras.xml
index 703b6e0..461f4fa 100644 (file)
--- a/extras.xml
+++ b/extras.xml
@@ -59,6 +59,7 @@
 
   <property name="tomcat-juli.jar" value="${tomcat.extras}/tomcat-juli.jar"/>
   <property name="tomcat-juli-adapters.jar" value="${tomcat.extras}/tomcat-juli-adapters.jar"/>
+  <property name="catalina-ws.jar" value="${tomcat.extras}/catalina-ws.jar"/>
        
   <!-- Classpath -->
   <path id="tomcat.classpath">
@@ -150,7 +151,54 @@
 
   </target>
 
-  <target name="extras" depends="prepare,commons-logging">
+  <target name="webservices">
+       
+           <mkdir dir="${tomcat.extras}/webservices"/>
+       
+           <antcall target="downloadfile">
+             <param name="sourcefile" value="${jaxrpc-src.loc}"/>
+             <param name="destfile" value="${tomcat.extras}/webservices/jaxrpc.jar"/>
+             <param name="destdir" value="${tomcat.extras}/webservices/"/>
+           </antcall>
+       
+           <antcall target="downloadfile">
+             <param name="sourcefile" value="${wsdl4j-src.loc}"/>
+             <param name="destfile" value="${tomcat.extras}/webservices/wsdl4j.jar"/>
+             <param name="destdir" value="${tomcat.extras}/webservices/"/>
+           </antcall>
+       
+           <!-- Classpath -->
+           <path id="tomcat.webservices.classpath">
+             <pathelement path="${tomcat.classpath}"/>
+             <fileset dir="${tomcat.extras}/webservices">
+               <include name="jaxrpc.jar"/>
+               <include name="wsdl4j.jar"/>
+             </fileset>
+           </path>
+       
+           <!-- Compile internal server components -->
+           <javac srcdir="java" destdir="${tomcat.classes}"
+                  debug="${compile.debug}"
+                  deprecation="${compile.deprecation}"
+                  source="${compile.source}"
+                  optimize="${compile.optimize}">
+             <classpath refid="tomcat.webservices.classpath" />
+             <include name="org/apache/naming/factory/webservices/**" />
+           </javac>
+       
+           <!-- Catalina Main JAR File -->
+           <jar jarfile="${catalina-ws.jar}">
+             <fileset dir="${tomcat.classes}">
+            <include name="org/apache/naming/factory/webservices/**" />
+               <!-- Javadoc and i18n exclusions -->
+               <exclude name="**/package.html" />
+               <exclude name="**/LocalStrings_*" />
+             </fileset>
+           </jar>
+       
+  </target>
+
+  <target name="extras" depends="prepare,commons-logging,webservices">
   </target>
 
   <!-- Download and dependency building -->