Author: kwright
Date: Fri Sep 26 16:58:44 2014
New Revision: 1627826
URL: http://svn.apache.org/r1627826
Log:
Build start.jar properly for proprietary area
Modified:
manifoldcf/branches/CONNECTORS-1048/framework/build.xml
Modified: manifoldcf/branches/CONNECTORS-1048/framework/build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1048/framework/build.xml?rev=1627826&r1=1627825&r2=1627826&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1048/framework/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-1048/framework/build.xml Fri Sep 26 16:58:44
2014
@@ -1382,69 +1382,8 @@
<fileset dir="${liblocation}" includes="*.jar"/>
</path>
<map from="${liblocation}" to="../lib"/>
- <!-- map from="\" to="/"/ -->
</pathconvert>
- <!-- Build a manifest file. There doesn't seem to be any good way to
do this automatically in ant without developing my own
- custom task, so I've hard coded all the class path libs. -->
- <!-- property name="manifest-cp-0" value=""/>
-
- <property name="manifest-cp-1" value="${manifest-cp-0}
../lib/commons-lang.jar"/>
- <property name="manifest-cp-2" value="${manifest-cp-1}
../lib/commons-codec.jar"/>
- <property name="manifest-cp-3" value="${manifest-cp-2}
../lib/commons-collections.jar"/>
- <property name="manifest-cp-4" value="${manifest-cp-3}
../lib/commons-el.jar"/>
- <property name="manifest-cp-5" value="${manifest-cp-4}
../lib/commons-fileupload.jar"/>
- <property name="manifest-cp-7" value="${manifest-cp-5}
../lib/commons-io.jar"/>
- <property name="manifest-cp-8" value="${manifest-cp-7}
../lib/commons-logging.jar"/>
- <property name="manifest-cp-9" value="${manifest-cp-8}
../lib/hsqldb.jar"/>
- <property name="manifest-cp-27" value="${manifest-cp-9}
../lib/jasper.jar"/>
- <property name="manifest-cp-28" value="${manifest-cp-27}
../lib/jasper-el.jar"/>
- <property name="manifest-cp-30" value="${manifest-cp-28}
../lib/jetty-server.jar"/>
- <property name="manifest-cp-31" value="${manifest-cp-30}
../lib/jetty-util.jar"/>
- <property name="manifest-cp-32" value="${manifest-cp-31}
../lib/jsp-api-2.1-glassfish.jar"/>
- <property name="manifest-cp-33" value="${manifest-cp-32}
../lib/json.jar"/>
- <property name="manifest-cp-34" value="${manifest-cp-33}
../lib/mcf-core.jar"/>
- <property name="manifest-cp-35" value="${manifest-cp-34}
../lib/mcf-agents.jar"/>
- <property name="manifest-cp-36" value="${manifest-cp-35}
../lib/mcf-jetty-runner.jar"/>
- <property name="manifest-cp-37" value="${manifest-cp-36}
../lib/mcf-pull-agent.jar"/>
- <property name="manifest-cp-38" value="${manifest-cp-37}
../lib/mcf-ui-core.jar"/>
- <property name="manifest-cp-39" value="${manifest-cp-38}
../lib/log4j.jar"/>
- <property name="manifest-cp-40" value="${manifest-cp-39}
../lib/postgresql.jar"/>
- <property name="manifest-cp-42" value="${manifest-cp-40}
../lib/serializer.jar"/>
- <property name="manifest-cp-43" value="${manifest-cp-42}
../lib/servlet-api.jar"/>
- <property name="manifest-cp-44" value="${manifest-cp-43}
../lib/juli.jar"/>
- <property name="manifest-cp-45" value="${manifest-cp-44}
../lib/xalan.jar"/>
- <property name="manifest-cp-46" value="${manifest-cp-45}
../lib/xercesImpl.jar"/>
- <property name="manifest-cp-47" value="${manifest-cp-46}
../lib/xml-apis.jar"/>
- <property name="manifest-cp-49" value="${manifest-cp-47}
../lib/ecj.jar"/>
- <property name="manifest-cp-50" value="${manifest-cp-49}
../lib/jetty-webapp.jar"/>
- <property name="manifest-cp-51" value="${manifest-cp-50}
../lib/jetty-servlet.jar"/>
- <property name="manifest-cp-52" value="${manifest-cp-51}
../lib/velocity.jar"/>
- <property name="manifest-cp-53" value="${manifest-cp-52}
../lib/jetty-http.jar"/>
- <property name="manifest-cp-54" value="${manifest-cp-53}
../lib/jetty-io.jar"/>
- <property name="manifest-cp-55" value="${manifest-cp-54}
../lib/jetty-security.jar"/>
- <property name="manifest-cp-56" value="${manifest-cp-55}
../lib/jetty-continuation.jar"/>
- <property name="manifest-cp-57" value="${manifest-cp-56}
../lib/jetty-xml.jar"/>
- <property name="manifest-cp-58" value="${manifest-cp-57}
../lib/slf4j-api.jar"/>
- <property name="manifest-cp-59" value="${manifest-cp-58}
../lib/slf4j-simple.jar"/>
- <property name="manifest-cp-60" value="${manifest-cp-59}
../lib/httpcore.jar"/>
- <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-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-73" value="${manifest-cp-72}
../lib/wss4j.jar"/>
- <property name="manifest-cp-74" value="${manifest-cp-73}
../lib/xmlsec.jar"/>
- <property name="manifest-cp-75" value="${manifest-cp-74}
../lib/opensaml.jar"/>
-
- <property name="manifest-cp" value="${manifest-cp-75}"/ -->
<mkdir dir="build/example"/>
<manifest file="build/example/manifest">
<attribute name="Main-Class"
value="org.apache.manifoldcf.jettyrunner.ManifoldCFJettyRunner"/>
@@ -1474,69 +1413,70 @@
</target>
<target name="single-process-start-jar-proprietary"
depends="lib,lib-proprietary">
- <!-- Build a manifest file. There doesn't seem to be any good way to
do this automatically in ant without developing my own
- custom task, so I've hard coded all the class path libs. -->
- <property name="manifest-cp-proprietary-0" value=""/>
-
- <property name="manifest-cp-proprietary-1"
value="${manifest-cp-proprietary-0} ../lib/commons-lang.jar"/>
- <property name="manifest-cp-proprietary-2"
value="${manifest-cp-proprietary-1} ../lib/commons-codec.jar"/>
- <property name="manifest-cp-proprietary-3"
value="${manifest-cp-proprietary-2} ../lib/commons-collections.jar"/>
- <property name="manifest-cp-proprietary-4"
value="${manifest-cp-proprietary-3} ../lib/commons-el.jar"/>
- <property name="manifest-cp-proprietary-5"
value="${manifest-cp-proprietary-4} ../lib/commons-fileupload.jar"/>
- <property name="manifest-cp-proprietary-7"
value="${manifest-cp-proprietary-5} ../lib/commons-io.jar"/>
- <property name="manifest-cp-proprietary-8"
value="${manifest-cp-proprietary-7} ../lib/commons-logging.jar"/>
- <property name="manifest-cp-proprietary-9"
value="${manifest-cp-proprietary-8} ../lib/hsqldb.jar"/>
- <property name="manifest-cp-proprietary-27"
value="${manifest-cp-proprietary-9} ../lib/jasper.jar"/>
- <property name="manifest-cp-proprietary-28"
value="${manifest-cp-proprietary-27} ../lib/jasper-el.jar"/>
- <property name="manifest-cp-proprietary-30"
value="${manifest-cp-proprietary-28} ../lib/jetty-server.jar"/>
- <property name="manifest-cp-proprietary-31"
value="${manifest-cp-proprietary-30} ../lib/jetty-util.jar"/>
- <property name="manifest-cp-proprietary-32"
value="${manifest-cp-proprietary-31} ../lib/jsp-api-2.1-glassfish.jar"/>
- <property name="manifest-cp-proprietary-33"
value="${manifest-cp-proprietary-32} ../lib/json.jar"/>
- <property name="manifest-cp-proprietary-34"
value="${manifest-cp-proprietary-33} ../lib/mcf-core.jar"/>
- <property name="manifest-cp-proprietary-35"
value="${manifest-cp-proprietary-34} ../lib/mcf-agents.jar"/>
- <property name="manifest-cp-proprietary-36"
value="${manifest-cp-proprietary-35} ../lib/mcf-jetty-runner.jar"/>
- <property name="manifest-cp-proprietary-37"
value="${manifest-cp-proprietary-36} ../lib/mcf-pull-agent.jar"/>
- <property name="manifest-cp-proprietary-38"
value="${manifest-cp-proprietary-37} ../lib/mcf-ui-core.jar"/>
- <property name="manifest-cp-proprietary-39"
value="${manifest-cp-proprietary-38} ../lib/log4j.jar"/>
- <property name="manifest-cp-proprietary-40"
value="${manifest-cp-proprietary-39} ../lib/postgresql.jar"/>
- <property name="manifest-cp-proprietary-41"
value="${manifest-cp-proprietary-40}
../lib-proprietary/mysql-connector-java.jar"/>
- <property name="manifest-cp-proprietary-42"
value="${manifest-cp-proprietary-41} ../lib/serializer.jar"/>
- <property name="manifest-cp-proprietary-43"
value="${manifest-cp-proprietary-42} ../lib/servlet-api.jar"/>
- <property name="manifest-cp-proprietary-44"
value="${manifest-cp-proprietary-43} ../lib/juli.jar"/>
- <property name="manifest-cp-proprietary-45"
value="${manifest-cp-proprietary-44} ../lib/xalan.jar"/>
- <property name="manifest-cp-proprietary-46"
value="${manifest-cp-proprietary-45} ../lib/xercesImpl.jar"/>
- <property name="manifest-cp-proprietary-47"
value="${manifest-cp-proprietary-46} ../lib/xml-apis.jar"/>
- <property name="manifest-cp-proprietary-49"
value="${manifest-cp-proprietary-47} ../lib/ecj.jar"/>
- <property name="manifest-cp-proprietary-50"
value="${manifest-cp-proprietary-49} ../lib-proprietary/ojdbc.jar"/>
- <property name="manifest-cp-proprietary-51"
value="${manifest-cp-proprietary-50} ../lib-proprietary/jtds.jar"/>
- <property name="manifest-cp-proprietary-52"
value="${manifest-cp-proprietary-51} ../lib/velocity.jar"/>
- <property name="manifest-cp-proprietary-53"
value="${manifest-cp-proprietary-52} ../lib/jetty-webapp.jar"/>
- <property name="manifest-cp-proprietary-54"
value="${manifest-cp-proprietary-53} ../lib/jetty-servlet.jar"/>
- <property name="manifest-cp-proprietary-55"
value="${manifest-cp-proprietary-54} ../lib/jetty-http.jar"/>
- <property name="manifest-cp-proprietary-56"
value="${manifest-cp-proprietary-55} ../lib/jetty-io.jar"/>
- <property name="manifest-cp-proprietary-57"
value="${manifest-cp-proprietary-56} ../lib/jetty-security.jar"/>
- <property name="manifest-cp-proprietary-58"
value="${manifest-cp-proprietary-57} ../lib/jetty-continuation.jar"/>
- <property name="manifest-cp-proprietary-59"
value="${manifest-cp-proprietary-58} ../lib/jetty-xml.jar"/>
- <property name="manifest-cp-proprietary-60"
value="${manifest-cp-proprietary-59} ../lib/slf4j-api.jar"/>
- <property name="manifest-cp-proprietary-61"
value="${manifest-cp-proprietary-60} ../lib/slf4j-simple.jar"/>
- <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-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-75"
value="${manifest-cp-proprietary-74} ../lib/wss4j.jar"/>
- <property name="manifest-cp-proprietary-76"
value="${manifest-cp-proprietary-75} ../lib/xmlsec.jar"/>
- <property name="manifest-cp-proprietary-77"
value="${manifest-cp-proprietary-76} ../lib/opensaml.jar"/>
+ <mkdir dir="build/example-proprietary/lib"/>
+ <copy todir="build/example-proprietary/lib">
+ <fileset dir="../lib">
+ <include name="commons-lang*.jar"/>
+ <include name="commons-codec*.jar"/>
+ <include name="commons-el*.jar"/>
+ <include name="commons-fileupload*.jar"/>
+ <include name="commons-io*.jar"/>
+ <include name="commons-logging*.jar"/>
+ <include name="hsqldb*.jar"/>
+ <include name="jasper*.jar"/>
+ <include name="jetty*.jar"/>
+ <include name="jsp-api-2.1-glassfish*.jar"/>
+ <include name="json*.jar"/>
+ <include name="log4j*.jar"/>
+ <include name="postgresql*.jar"/>
+ <include name="serializer*.jar"/>
+ <include name="servlet-api*.jar"/>
+ <include name="juli*.jar"/>
+ <include name="xalan*.jar"/>
+ <include name="xercesImpl*.jar"/>
+ <include name="xml-apis*.jar"/>
+ <include name="ecj*.jar"/>
+ <include name="velocity*.jar"/>
+ <include name="slf4j-api*.jar"/>
+ <include name="slf4j-simple*.jar"/>
+ <include name="httpcore*.jar"/>
+ <include name="httpclient*.jar"/>
+ <include name="mail*.jar"/>
+ <include name="zookeeper*.jar"/>
+ <include name="castor*.jar"/>
+ <include name="geronimo-javamail_1.4_spec*.jar"/>
+ <include name="commons-discovery*.jar"/>
+ <include name="axis*.jar"/>
+ <include name="wsdl4j*.jar"/>
+ <include name="saaj-api*.jar"/>
+ <include name="saaj-impl*.jar"/>
+ <include name="activation*.jar"/>
+ <include name="wss4j*.jar"/>
+ <include name="xmlsec*.jar"/>
+ <include name="opensaml*.jar"/>
+ </fileset>
+ <fileset dir="../lib-proprietary">
+ <include name="mysql-connector-java*.jar"/>
+ <include name="ojdbc*.jar"/>
+ <include name="jtds*.jar"/>
+ </fileset>
+ <fileset dir="build/jar">
+ <include name="mcf-core.jar"/>
+ <include name="mcf-agents.jar"/>
+ <include name="mcf-pull-agent.jar"/>
+ <include name="mcf-jetty-runner.jar"/>
+ <include name="mcf-ui-core.jar"/>
+ </fileset>
+ </copy>
- <property name="manifest-cp-proprietary"
value="${manifest-cp-proprietary-77}"/>
+ <property name="liblocation-proprietary"
location="build/example-proprietary/lib" />
+ <pathconvert property="manifest-cp-proprietary" dirsep="/" pathsep=" ">
+ <path>
+ <fileset dir="${liblocation-proprietary}" includes="*.jar"/>
+ </path>
+ <map from="${liblocation-proprietary}" to="../lib"/>
+ </pathconvert>
+
<mkdir dir="build/example-proprietary"/>
<manifest file="build/example-proprietary/manifest">
<attribute name="Main-Class"
value="org.apache.manifoldcf.jettyrunner.ManifoldCFJettyRunner"/>
