[patch] Remove extras

extras.patch (text/plain), 8.70 KB, created by Remy Maucherat on 2019-01-10 12:25:11 UTC

(hide)

Description: Remove extras

Filename:

MIME Type:

Creator: Remy Maucherat

Created: 2019-01-10 12:25:11 UTC

Size: 8.70 KB

patch

obsolete

>Index: build.xml >=================================================================== >--- build.xml (revision 1850935) >+++ build.xml (working copy) >@@ -213,6 +213,8 @@ > <path id="compile.classpath"> > <pathelement location="${jdt.jar}"/> > <pathelement location="${saaj-api.jar}"/> >+ <pathelement location="${jaxrpc-lib.jar}"/> >+ <pathelement location="${wsdl4j-lib.jar}"/> > </path> > > <path id="tomcat.classpath"> >@@ -231,14 +233,6 @@ > <path refid="tomcat.classpath" /> > </path> > >- <path id="tomcat.webservices.classpath"> >- <path refid="tomcat.classpath" /> >- <fileset dir="${tomcat.extras}/webservices"> >- <include name="jaxrpc.jar"/> >- <include name="wsdl4j.jar"/> >- </fileset> >- </path> >- > <!-- Version info filter set --> > <tstamp> > <format property="year" pattern="yyyy" locale="en" timezone="UTC"/> >@@ -413,10 +407,8 @@ > <!-- Modules --> > <exclude name="org/apache/catalina/ant/**" /> > <exclude name="org/apache/catalina/ha/**" /> >- <exclude name="org/apache/catalina/mbeans/JmxRemote*" /> > <exclude name="org/apache/catalina/tribes/**" /> > <exclude name="org/apache/catalina/storeconfig/**" /> >- <exclude name="org/apache/naming/factory/webservices/**" /> > </patternset> > > <patternset id="files.catalina-tribes"> >@@ -505,15 +497,6 @@ > <!-- See BZ 61439 --> > <!--<patternset refid="files.annotations-api" />--> > >- <!-- Pattern sets for extras JARs --> >- <patternset id="files.tomcat-extras-ws"> >- <include name="org/apache/naming/factory/webservices/**" /> >- </patternset> >- >- <patternset id="files.tomcat-extras-jmxremote"> >- <include name="org/apache/catalina/mbeans/JmxRemote*" /> >- </patternset> >- > <!-- =========================== Build targets =========================== --> > > <target name="build-prepare"> >@@ -704,7 +687,6 @@ > <compilerarg value="-Xlint:unchecked"/> > --> > <classpath refid="compile.classpath" /> >- <exclude name="org/apache/naming/factory/webservices/**" /> > </javac> > <!-- Copy static resource files --> > <copy todir="${tomcat.classes}" encoding="ISO-8859-1"> >@@ -1734,84 +1716,9 @@ > <mkdir dir="${tomcat.extras.sources}"/> > <mkdir dir="${tomcat.embed}"/> > <mkdir dir="${tomcat.embed.sources}"/> >- <mkdir dir="${tomcat.extras}/webservices"/> >- </target> >- >- <target name="extras-webservices-prepare" >- depends="extras-prepare" >- description="Prepare to build web services extras package"> >- >- <antcall target="downloadfile"> >- <param name="sourcefile" value="${jaxrpc-lib.loc}"/> >- <param name="destfile" value="${jaxrpc-lib.jar}"/> >- <param name="destdir" value="${jaxrpc-lib.home}"/> >- <param name="checksum.enabled" value="${jaxrpc-lib.checksum.enabled}"/> >- <param name="checksum.algorithm" value="${jaxrpc-lib.checksum.algorithm}"/> >- <param name="checksum.value" value="${jaxrpc-lib.checksum.value}"/> >- </antcall> >- >- <antcall target="downloadfile"> >- <param name="sourcefile" value="${wsdl4j-lib.loc}"/> >- <param name="destfile" value="${wsdl4j-lib.jar}"/> >- <param name="destdir" value="${wsdl4j-lib.home}"/> >- <param name="checksum.enabled" value="${wsdl4j-lib.checksum.enabled}"/> >- <param name="checksum.algorithm" value="${wsdl4j-lib.checksum.algorithm}"/> >- <param name="checksum.value" value="${wsdl4j-lib.checksum.value}"/> >- </antcall> >- >- <copy file="${jaxrpc-lib.jar}" >- tofile="${tomcat.extras}/webservices/jaxrpc.jar" /> >- <copy file="${wsdl4j-lib.jar}" >- tofile="${tomcat.extras}/webservices/wsdl4j.jar" /> >- </target> >- >- <target name="extras-webservices" >- depends="extras-webservices-prepare,compile,build-manifests" >- description="Build web services extras package"> >- >- <!-- Compile web services classes components --> >- <javac srcdir="java" destdir="${tomcat.classes}" >- debug="${compile.debug}" >- deprecation="${compile.deprecation}" >- source="${compile.source}" >- target="${compile.target}" >- release="${compile.release}" >- encoding="ISO-8859-1" >- includeantruntime="false"> >- <classpath refid="tomcat.webservices.classpath" /> >- <include name="org/apache/naming/factory/webservices/**" /> >- </javac> >- >- <jarIt jarfile="${catalina-ws.jar}" >- filesDir="${tomcat.classes}" >- filesId="files.tomcat-extras-ws" /> >- >- <hashAndSign file="${catalina-ws.jar}" /> >- >- <jarIt jarfile="${catalina-ws-src.jar}" >- filesDir="java" >- filesId="files.tomcat-extras-ws" /> >- >- </target> >- >- <target name="extras-jmx-remote" >- depends="extras-prepare,compile,build-manifests" >- description="Build JMX remote extras package"> >- >- <jarIt jarfile="${catalina-jmx-remote.jar}" >- filesDir="${tomcat.classes}" >- filesId="files.tomcat-extras-jmxremote" /> >- >- <hashAndSign file="${catalina-jmx-remote.jar}" /> >- >- <jarIt jarfile="${catalina-jmx-remote-src.jar}" >- filesDir="java" >- filesId="files.tomcat-extras-jmxremote" /> >- > </target> > > <target name="extras" >- depends="extras-webservices,extras-jmx-remote" > description="Build all extras packages"> > </target> > >@@ -1901,7 +1808,7 @@ > > </target> > >- <target name="javadoc" depends="dist-source,extras-webservices-prepare" >+ <target name="javadoc" depends="dist-source" > description="Create the Tomcat javadoc" > > <javadoc packagenames="javax.servlet.*" > excludepackagenames="javax.servlet.jsp.*" >@@ -1921,7 +1828,6 @@ > failonwarning="true"> > <classpath> > <path refid="compile.classpath"/> >- <path refid="tomcat.webservices.classpath"/> > <path location="${ant.core.lib}"/> > </classpath> > </javadoc> >@@ -1942,7 +1848,6 @@ > failonwarning="true"> > <classpath> > <path refid="compile.classpath"/> >- <path refid="tomcat.webservices.classpath"/> > <path location="${ant.core.lib}"/> > </classpath> > </javadoc> >@@ -1963,7 +1868,6 @@ > failonwarning="true"> > <classpath> > <path refid="compile.classpath"/> >- <path refid="tomcat.webservices.classpath"/> > <path location="${ant.core.lib}"/> > </classpath> > </javadoc> >@@ -1984,7 +1888,6 @@ > failonwarning="true"> > <classpath> > <path refid="compile.classpath"/> >- <path refid="tomcat.webservices.classpath"/> > <path location="${ant.core.lib}"/> > </classpath> > </javadoc> >@@ -2004,7 +1907,6 @@ > failonwarning="true"> > <classpath> > <path refid="compile.classpath"/> >- <path refid="tomcat.webservices.classpath"/> > <path location="${ant.core.lib}"/> > </classpath> > <link href="../servletapi"/> >@@ -2765,7 +2667,26 @@ > <param name="checksum.value" value="${saaj-api.checksum.value}"/> > </antcall> > >- </target> >+ >+ <!-- Download WS API --> >+ <antcall target="downloadfile"> >+ <param name="sourcefile" value="${jaxrpc-lib.loc}"/> >+ <param name="destfile" value="${jaxrpc-lib.jar}"/> >+ <param name="destdir" value="${jaxrpc-lib.home}"/> >+ <param name="checksum.enabled" value="${jaxrpc-lib.checksum.enabled}"/> >+ <param name="checksum.algorithm" value="${jaxrpc-lib.checksum.algorithm}"/> >+ <param name="checksum.value" value="${jaxrpc-lib.checksum.value}"/> >+ </antcall> >+ <antcall target="downloadfile"> >+ <param name="sourcefile" value="${wsdl4j-lib.loc}"/> >+ <param name="destfile" value="${wsdl4j-lib.jar}"/> >+ <param name="destdir" value="${wsdl4j-lib.home}"/> >+ <param name="checksum.enabled" value="${wsdl4j-lib.checksum.enabled}"/> >+ <param name="checksum.algorithm" value="${wsdl4j-lib.checksum.algorithm}"/> >+ <param name="checksum.value" value="${wsdl4j-lib.checksum.value}"/> >+ </antcall> >+ >+ </target> > > <target name="download-test-compile" > description="Download additional components for the tests" > >@@ -3175,7 +3096,7 @@ > <!-- ============================ Eclipse ================================ --> > > <target name="ide-eclipse" >- depends="download-compile, extras-webservices-prepare, download-test-compile" >+ depends="download-compile, download-test-compile" > description="Prepares the source tree to be built in Eclipse"> > > <!-- Copy the sample project files into the root directory --> >@@ -3193,7 +3114,7 @@ > <!-- ============================ IntelliJ IDEA=========================== --> > > <target name="ide-intellij" >- depends="download-compile, extras-webservices-prepare, download-test-compile" >+ depends="download-compile, download-test-compile" > description="Creates project directory .idea for IntelliJ IDEA"> > > <copy todir="${tomcat.home}/.idea"> > View Attachment As Diff View Attachment As Raw

This is ASF Bugzilla: the Apache Software Foundation bug system. In case of problems with the functioning of ASF Bugzilla, please contact bugzilla-admin@apache.org. Please Note: this e-mail address is only for reporting problems with ASF Bugzilla. Mail about any other subject will be silently ignored.

• • Home
  • | New
  • | Browse
  • | Search
  • |
    [?]
  • | Reports
  • | Help
  • | New Account
  • | Log In
    Remember [x]
  • | Forgot Password
    Login: [x]