Author: kwright
Date: Mon Mar 24 12:02:59 2014
New Revision: 1580820
URL: http://svn.apache.org/r1580820
Log:
Move axis and castor to root-level dependencies; this allows them to be
delivered into the dist/lib directory
Modified:
manifoldcf/branches/CONNECTORS-912/framework/build.xml
manifoldcf/branches/CONNECTORS-912/framework/buildfiles/connector-build.xml
Modified: manifoldcf/branches/CONNECTORS-912/framework/build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-912/framework/build.xml?rev=1580820&r1=1580819&r2=1580820&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-912/framework/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-912/framework/build.xml Mon Mar 24 12:02:59
2014
@@ -308,6 +308,15 @@
<mkdir dir="build/webapp/authority-service/WEB-INF/lib"/>
<copy todir="build/webapp/authority-service/WEB-INF/lib">
<fileset dir="../lib">
+ <include name="castor*.jar"/>
+ <include name="geronimo-javamail_1.4_spec*.jar"/>
+ <include name="commons-discovery*.jar"/>
+ <include name="axis*.jar"/>
+ <include name="saaj*.jar"/>
+ <include name="wsdl4j*.jar"/>
+ <include name="activation*.jar"/>
+ </fileset>
+ <fileset dir="../lib">
<include name="zookeeper*.jar"/>
<include name="json*.jar"/>
<include name="commons-codec*.jar"/>
@@ -348,6 +357,15 @@
<mkdir dir="build/webapp/authority-service-proprietary/WEB-INF/lib"/>
<copy todir="build/webapp/authority-service-proprietary/WEB-INF/lib">
<fileset dir="../lib">
+ <include name="castor*.jar"/>
+ <include name="geronimo-javamail_1.4_spec*.jar"/>
+ <include name="commons-discovery*.jar"/>
+ <include name="axis*.jar"/>
+ <include name="saaj*.jar"/>
+ <include name="wsdl4j*.jar"/>
+ <include name="activation*.jar"/>
+ </fileset>
+ <fileset dir="../lib">
<include name="zookeeper*.jar"/>
<include name="json*.jar"/>
<include name="commons-codec*.jar"/>
@@ -393,6 +411,15 @@
<mkdir dir="build/webapp/api-service/WEB-INF/lib"/>
<copy todir="build/webapp/api-service/WEB-INF/lib">
<fileset dir="../lib">
+ <include name="castor*.jar"/>
+ <include name="geronimo-javamail_1.4_spec*.jar"/>
+ <include name="commons-discovery*.jar"/>
+ <include name="axis*.jar"/>
+ <include name="saaj*.jar"/>
+ <include name="wsdl4j*.jar"/>
+ <include name="activation*.jar"/>
+ </fileset>
+ <fileset dir="../lib">
<include name="zookeeper*.jar"/>
<include name="json*.jar"/>
<include name="commons-codec*.jar"/>
@@ -434,6 +461,15 @@
<mkdir dir="build/webapp/api-service-proprietary/WEB-INF/lib"/>
<copy todir="build/webapp/api-service-proprietary/WEB-INF/lib">
<fileset dir="../lib">
+ <include name="castor*.jar"/>
+ <include name="geronimo-javamail_1.4_spec*.jar"/>
+ <include name="commons-discovery*.jar"/>
+ <include name="axis*.jar"/>
+ <include name="saaj*.jar"/>
+ <include name="wsdl4j*.jar"/>
+ <include name="activation*.jar"/>
+ </fileset>
+ <fileset dir="../lib">
<include name="zookeeper*.jar"/>
<include name="json*.jar"/>
<include name="commons-codec*.jar"/>
@@ -480,6 +516,15 @@
<mkdir dir="build/webapp/crawler-ui/WEB-INF/lib"/>
<copy todir="build/webapp/crawler-ui/WEB-INF/lib">
<fileset dir="../lib">
+ <include name="castor*.jar"/>
+ <include name="geronimo-javamail_1.4_spec*.jar"/>
+ <include name="commons-discovery*.jar"/>
+ <include name="axis*.jar"/>
+ <include name="saaj*.jar"/>
+ <include name="wsdl4j*.jar"/>
+ <include name="activation*.jar"/>
+ </fileset>
+ <fileset dir="../lib">
<include name="jstl*.jar"/>
<include name="zookeeper*.jar"/>
<include name="json*.jar"/>
@@ -529,6 +574,15 @@
<mkdir dir="build/webapp/crawler-ui-proprietary/WEB-INF/lib"/>
<copy todir="build/webapp/crawler-ui-proprietary/WEB-INF/lib">
<fileset dir="../lib">
+ <include name="castor*.jar"/>
+ <include name="geronimo-javamail_1.4_spec*.jar"/>
+ <include name="commons-discovery*.jar"/>
+ <include name="axis*.jar"/>
+ <include name="saaj*.jar"/>
+ <include name="wsdl4j*.jar"/>
+ <include name="activation*.jar"/>
+ </fileset>
+ <fileset dir="../lib">
<include name="jstl*.jar"/>
<include name="zookeeper*.jar"/>
<include name="json*.jar"/>
@@ -585,6 +639,15 @@
<mkdir dir="build/webapp/combined-service/WEB-INF/lib"/>
<copy todir="build/webapp/combined-service/WEB-INF/lib">
<fileset dir="../lib">
+ <include name="castor*.jar"/>
+ <include name="geronimo-javamail_1.4_spec*.jar"/>
+ <include name="commons-discovery*.jar"/>
+ <include name="axis*.jar"/>
+ <include name="saaj*.jar"/>
+ <include name="wsdl4j*.jar"/>
+ <include name="activation*.jar"/>
+ </fileset>
+ <fileset dir="../lib">
<include name="jstl*.jar"/>
<include name="zookeeper*.jar"/>
<include name="json*.jar"/>
@@ -636,6 +699,15 @@
<mkdir dir="build/webapp/combined-service-proprietary/WEB-INF/lib"/>
<copy todir="build/webapp/combined-service-proprietary/WEB-INF/lib">
<fileset dir="../lib">
+ <include name="castor*.jar"/>
+ <include name="geronimo-javamail_1.4_spec*.jar"/>
+ <include name="commons-discovery*.jar"/>
+ <include name="axis*.jar"/>
+ <include name="saaj*.jar"/>
+ <include name="wsdl4j*.jar"/>
+ <include name="activation*.jar"/>
+ </fileset>
+ <fileset dir="../lib">
<include name="jstl*.jar"/>
<include name="zookeeper*.jar"/>
<include name="json*.jar"/>
@@ -755,6 +827,15 @@
<mkdir dir="dist/lib"/>
<copy todir="dist/lib">
<fileset dir="../lib">
+ <include name="castor*.jar"/>
+ <include name="geronimo-javamail_1.4_spec*.jar"/>
+ <include name="commons-discovery*.jar"/>
+ <include name="axis*.jar"/>
+ <include name="saaj*.jar"/>
+ <include name="wsdl4j*.jar"/>
+ <include name="activation*.jar"/>
+ </fileset>
+ <fileset dir="../lib">
<include name="zookeeper*.jar"/>
<include name="json*.jar"/>
<include name="commons-codec*.jar"/>
@@ -920,6 +1001,15 @@
</target>
<target name="setup-jetty-processes"
depends="preclean-jetty-processes,scripts-jetty">
+ <antcall target="general-jetty-add-lib-classpath"><param
name="lib-jar" value="castor.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
+ <antcall target="general-jetty-add-lib-classpath"><param
name="lib-jar" value="geronimo-javamail_1.4_spec.jar"/><param
name="processes-dir" value="${processes-dir}"/></antcall>
+ <antcall target="general-jetty-add-lib-classpath"><param
name="lib-jar" value="commons-discovery.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
+ <antcall target="general-jetty-add-lib-classpath"><param
name="lib-jar" value="axis-jaxrpc.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
+ <antcall target="general-jetty-add-lib-classpath"><param
name="lib-jar" value="axis.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
+ <antcall target="general-jetty-add-lib-classpath"><param
name="lib-jar" value="wsdl4j.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
+ <antcall target="general-jetty-add-lib-classpath"><param
name="lib-jar" value="saaj-api.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
+ <antcall target="general-jetty-add-lib-classpath"><param
name="lib-jar" value="saaj-impl.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
+ <antcall target="general-jetty-add-lib-classpath"><param
name="lib-jar" value="activation.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
<antcall target="general-jetty-add-lib-classpath"><param
name="lib-jar" value="zookeeper.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
<antcall target="general-jetty-add-lib-classpath"><param
name="lib-jar" value="json.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
<antcall target="general-jetty-add-lib-classpath"><param
name="lib-jar" value="json-simple.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
@@ -953,6 +1043,15 @@
</target>
<target name="setup-combined-processes"
depends="preclean-combined-processes,scripts-combined">
+ <antcall target="general-combined-add-lib-classpath"><param
name="lib-jar" value="castor.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
+ <antcall target="general-combined-add-lib-classpath"><param
name="lib-jar" value="geronimo-javamail_1.4_spec.jar"/><param
name="processes-dir" value="${processes-dir}"/></antcall>
+ <antcall target="general-combined-add-lib-classpath"><param
name="lib-jar" value="commons-discovery.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
+ <antcall target="general-combined-add-lib-classpath"><param
name="lib-jar" value="axis-jaxrpc.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
+ <antcall target="general-combined-add-lib-classpath"><param
name="lib-jar" value="axis.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
+ <antcall target="general-combined-add-lib-classpath"><param
name="lib-jar" value="wsdl4j.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
+ <antcall target="general-combined-add-lib-classpath"><param
name="lib-jar" value="saaj-api.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
+ <antcall target="general-combined-add-lib-classpath"><param
name="lib-jar" value="saaj-impl.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
+ <antcall target="general-combined-add-lib-classpath"><param
name="lib-jar" value="activation.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
<antcall target="general-combined-add-lib-classpath"><param
name="lib-jar" value="zookeeper.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
<antcall target="general-combined-add-lib-classpath"><param
name="lib-jar" value="json.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
<antcall target="general-combined-add-lib-classpath"><param
name="lib-jar" value="json-simple.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
@@ -986,6 +1085,15 @@
</target>
<target name="setup-processes" depends="preclean-processes,scripts">
+ <antcall target="general-add-lib-classpath"><param name="lib-jar"
value="castor.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
+ <antcall target="general-add-lib-classpath"><param name="lib-jar"
value="geronimo-javamail_1.4_spec.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
+ <antcall target="general-add-lib-classpath"><param name="lib-jar"
value="commons-discovery.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
+ <antcall target="general-add-lib-classpath"><param name="lib-jar"
value="axis-jaxrpc.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
+ <antcall target="general-add-lib-classpath"><param name="lib-jar"
value="axis.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
+ <antcall target="general-add-lib-classpath"><param name="lib-jar"
value="wsdl4j.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
+ <antcall target="general-add-lib-classpath"><param name="lib-jar"
value="saaj-api.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
+ <antcall target="general-add-lib-classpath"><param name="lib-jar"
value="saaj-impl.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
+ <antcall target="general-add-lib-classpath"><param name="lib-jar"
value="activation.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
<antcall target="general-add-lib-classpath"><param name="lib-jar"
value="zookeeper.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
<antcall target="general-add-lib-classpath"><param name="lib-jar"
value="json.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
<antcall target="general-add-lib-classpath"><param name="lib-jar"
value="json-simple.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
@@ -1267,7 +1375,17 @@
<property name="manifest-cp-61" value="${manifest-cp-60}
../lib/httpclient.jar"/>
<property name="manifest-cp-62" value="${manifest-cp-61}
../lib/mail.jar"/>
<property name="manifest-cp-63" value="${manifest-cp-62}
../lib/zookeeper.jar"/>
- <property name="manifest-cp" value="${manifest-cp-63}"/>
+ <property name="manifest-cp-64" value="${manifest-cp-63}
../lib/castor.jar"/>
+ <property name="manifest-cp-65" value="${manifest-cp-64}
../lib/geronimo-javamail_1.4_spec.jar"/>
+ <property name="manifest-cp-66" value="${manifest-cp-65}
../lib/commons-discovery.jar"/>
+ <property name="manifest-cp-67" value="${manifest-cp-66}
../lib/axis-jaxrpc.jar"/>
+ <property name="manifest-cp-68" value="${manifest-cp-67}
../lib/axis.jar"/>
+ <property name="manifest-cp-69" value="${manifest-cp-68}
../lib/wsdl4j.jar"/>
+ <property name="manifest-cp-70" value="${manifest-cp-69}
../lib/saaj-api.jar"/>
+ <property name="manifest-cp-71" value="${manifest-cp-70}
../lib/saaj-impl.jar"/>
+ <property name="manifest-cp-72" value="${manifest-cp-71}
../lib/activation.jar"/>
+
+ <property name="manifest-cp" value="${manifest-cp-72}"/>
<mkdir dir="build/example"/>
<manifest file="build/example/manifest">
<attribute name="Main-Class"
value="org.apache.manifoldcf.jettyrunner.ManifoldCFJettyRunner"/>
@@ -1360,8 +1478,18 @@
<property name="manifest-cp-proprietary-62"
value="${manifest-cp-proprietary-61} ../lib/httpcore.jar"/>
<property name="manifest-cp-proprietary-63"
value="${manifest-cp-proprietary-62} ../lib/httpclient.jar"/>
<property name="manifest-cp-proprietary-64"
value="${manifest-cp-proprietary-63} ../lib/mail.jar"/>
- <property name="manifest-cp-proprietary-65"
value="${manifest-cp-proprietary-63} ../lib/zookeeper.jar"/>
- <property name="manifest-cp-proprietary"
value="${manifest-cp-proprietary-65}"/>
+ <property name="manifest-cp-proprietary-65"
value="${manifest-cp-proprietary-64} ../lib/zookeeper.jar"/>
+ <property name="manifest-cp-proprietary-66"
value="${manifest-cp-proprietary-65} ../lib/castor.jar"/>
+ <property name="manifest-cp-proprietary-67"
value="${manifest-cp-proprietary-66} ../lib/geronimo-javamail_1.4_spec.jar"/>
+ <property name="manifest-cp-proprietary-68"
value="${manifest-cp-proprietary-67} ../lib/commons-discovery.jar"/>
+ <property name="manifest-cp-proprietary-69"
value="${manifest-cp-proprietary-68} ../lib/axis-jaxrpc.jar"/>
+ <property name="manifest-cp-proprietary-70"
value="${manifest-cp-proprietary-69} ../lib/axis.jar"/>
+ <property name="manifest-cp-proprietary-71"
value="${manifest-cp-proprietary-70} ../lib/wsdl4j.jar"/>
+ <property name="manifest-cp-proprietary-72"
value="${manifest-cp-proprietary-71} ../lib/saaj-api.jar"/>
+ <property name="manifest-cp-proprietary-73"
value="${manifest-cp-proprietary-72} ../lib/saaj-impl.jar"/>
+ <property name="manifest-cp-proprietary-74"
value="${manifest-cp-proprietary-73} ../lib/activation.jar"/>
+
+ <property name="manifest-cp-proprietary"
value="${manifest-cp-proprietary-74}"/>
<mkdir dir="build/example-proprietary"/>
<manifest file="build/example-proprietary/manifest">
<attribute name="Main-Class"
value="org.apache.manifoldcf.jettyrunner.ManifoldCFJettyRunner"/>
Modified:
manifoldcf/branches/CONNECTORS-912/framework/buildfiles/connector-build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-912/framework/buildfiles/connector-build.xml?rev=1580820&r1=1580819&r2=1580820&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-912/framework/buildfiles/connector-build.xml
(original)
+++ manifoldcf/branches/CONNECTORS-912/framework/buildfiles/connector-build.xml
Mon Mar 24 12:02:59 2014
@@ -67,15 +67,11 @@
<fileset dir="${mcf-dist}/lib">
<include name="axis*.jar"/>
<include name="saaj*.jar"/>
- <include name="wsdl*.jar"/>
+ <include name="wsdl4j*.jar"/>
<include name="commons-discovery*.jar"/>
<include name="activation*.jar"/>
- </fileset>
- <fileset dir="${mcf-dist}/lib">
<include name="castor*.jar"/>
- <include name="geronimo-activation_1.1_spec*.jar"/>
<include name="geronimo-javamail_1.4_spec*.jar"/>
- <include name="commons-discovery*.jar"/>
</fileset>
<pathelement location="build/stubclasses"/>
<pathelement location="build/wsdlclasses"/>
@@ -518,7 +514,7 @@
</target>
<target name="lib-wsdls" depends="has-wsdls-check" if="hasWSDLs">
- <mkdir dir="dist/lib"/>
+ <!-- mkdir dir="dist/lib"/>
<copy todir="dist/lib">
<fileset dir="${mcf-dist}/lib">
<include name="axis*.jar"/>
@@ -527,18 +523,18 @@
<include name="activation*.jar"/>
<include name="commons-discovery*.jar"/>
</fileset>
- </copy>
+ </copy -->
</target>
<target name="lib-xsds" depends="has-xsds-check" if="hasXSDs">
- <mkdir dir="dist/lib"/>
+ <!-- mkdir dir="dist/lib"/>
<copy todir="dist/lib">
<fileset dir="${mcf-dist}/lib">
<include name="castor*.jar"/>
<include name="geronimo-activation_1.1_spec*.jar"/>
<include name="geronimo-javamail_1.4_spec*.jar"/>
</fileset>
- </copy>
+ </copy -->
</target>
<target name="lib"
depends="lib-rmi,lib-wsdls,lib-xsds,jar-connector,precompile-check"
if="canBuild">
