manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1631727 [5/8] - in /manifoldcf/branches/dev_1x: ./ connectors/alfresco/ connectors/cmis/ connectors/cmis/test-materials/ connectors/documentum/registry-scripts/ connectors/documentum/server-scripts/ connectors/elasticsearch/ connectors/ela...
Date Tue, 14 Oct 2014 12:09:07 GMT
Propchange: manifoldcf/branches/dev_1x/framework/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Oct 14 12:09:05 2014
@@ -0,0 +1,115 @@
+/incubator/lcf/branches/CONNECTORS-151-branch/framework:1063444-1071206
+/incubator/lcf/branches/CONNECTORS-160-branch/framework:1071241-1071534
+/incubator/lcf/branches/CONNECTORS-195/framework:1098950-1099321
+/incubator/lcf/branches/CONNECTORS-203/framework:1128152-1130460
+/incubator/lcf/branches/CONNECTORS-221/framework:1143785-1151084
+/incubator/lcf/branches/CONNECTORS-223/framework:1146689-1146810
+/incubator/lcf/branches/CONNECTORS-224/framework:1154884-1158633
+/incubator/lcf/branches/CONNECTORS-236/framework:1153921-1154314
+/incubator/lcf/branches/CONNECTORS-240/framework:1163953-1166425
+/incubator/lcf/branches/CONNECTORS-256/framework:1172846-1182809
+/incubator/lcf/branches/CONNECTORS-277/framework:1185949-1187036
+/incubator/lcf/branches/CONNECTORS-284/framework:1189305-1190398
+/incubator/lcf/branches/CONNECTORS-287/framework:1200390-1210394
+/incubator/lcf/branches/CONNECTORS-288/framework:1240833-1299573
+/incubator/lcf/branches/CONNECTORS-290/framework:1204836-1205502
+/incubator/lcf/branches/CONNECTORS-313/framework:1213173-1214848
+/incubator/lcf/branches/CONNECTORS-314/framework:1221058,1221068
+/incubator/lcf/branches/CONNECTORS-32/framework:1092556-1094216
+/incubator/lcf/branches/CONNECTORS-335/framework:1222285-1225060
+/incubator/lcf/branches/CONNECTORS-336/framework:1222382-1231874
+/incubator/lcf/branches/CONNECTORS-353/framework:1226361-1226428
+/incubator/lcf/branches/CONNECTORS-388/framework:1233014-1234466
+/incubator/lcf/branches/CONNECTORS-402/framework:1242059-1242965
+/incubator/lcf/branches/CONNECTORS-420/framework:1295533-1295923
+/incubator/lcf/branches/CONNECTORS-422/framework:1298811-1299486
+/incubator/lcf/branches/CONNECTORS-423/framework:1301010-1302518
+/incubator/lcf/branches/CONNECTORS-437/framework:1306096-1308128
+/incubator/lcf/branches/CONNECTORS-443/framework:1308492-1308863
+/incubator/lcf/branches/CONNECTORS-459/framework:1326580-1327781
+/incubator/lcf/branches/CONNECTORS-460/framework:1324786-1326539
+/incubator/lcf/branches/CONNECTORS-470/framework:1337828-1349740
+/incubator/lcf/branches/CONNECTORS-474/framework:1340041-1349740
+/incubator/lcf/branches/CONNECTORS-96/framework:1335360-1336940
+/manifoldcf/branches/CONNECTORS-1027/framework:1624243-1624462
+/manifoldcf/branches/CONNECTORS-1037/framework:1628690-1629377
+/manifoldcf/branches/CONNECTORS-1048/framework:1627756-1627957
+/manifoldcf/branches/CONNECTORS-1050/framework:1628142-1628796
+/manifoldcf/branches/CONNECTORS-1067/framework:1630049-1630186
+/manifoldcf/branches/CONNECTORS-1068/framework:1630245-1630621
+/manifoldcf/branches/CONNECTORS-120/framework:1406712-1407974,1407982-1411043,1411049-1416451
+/manifoldcf/branches/CONNECTORS-120-1/framework:1416450-1417056
+/manifoldcf/branches/CONNECTORS-13/framework:1525862-1527182,1539324-1541634
+/manifoldcf/branches/CONNECTORS-470/framework:1349741-1360750,1360808
+/manifoldcf/branches/CONNECTORS-474/framework:1349741-1353803
+/manifoldcf/branches/CONNECTORS-488/framework:1363249-1364203
+/manifoldcf/branches/CONNECTORS-492/framework:1368611-1381230
+/manifoldcf/branches/CONNECTORS-497/framework:1368852-1371018
+/manifoldcf/branches/CONNECTORS-501/framework:1370450-1372223
+/manifoldcf/branches/CONNECTORS-515/framework:1379845-1384619
+/manifoldcf/branches/CONNECTORS-518/framework:1381596-1384051
+/manifoldcf/branches/CONNECTORS-523/framework:1381033-1382537
+/manifoldcf/branches/CONNECTORS-552-2/framework:1438584-1439172
+/manifoldcf/branches/CONNECTORS-553/framework:1534730-1550120,1550125-1550463,1550467-1552343,1552346-1552899
+/manifoldcf/branches/CONNECTORS-553-2/framework:1550121-1550124,1550464-1550466,1552306-1552345
+/manifoldcf/branches/CONNECTORS-563/framework:1405810-1419032
+/manifoldcf/branches/CONNECTORS-565/framework:1545907-1550085,1550088-1550498,1550501-1567621,1567624-1584007,1584010-1601659,1601663-1603324,1603327-1613086,1613090-1613193
+/manifoldcf/branches/CONNECTORS-565-2/framework:1550086-1550087,1550498-1550500,1567622-1567623,1584007-1584009,1601658-1601662,1603325-1603326,1613086-1613089
+/manifoldcf/branches/CONNECTORS-566/framework:1406653-1419070
+/manifoldcf/branches/CONNECTORS-578/framework:1418127-1421420
+/manifoldcf/branches/CONNECTORS-581/framework:1419077-1419175
+/manifoldcf/branches/CONNECTORS-584/framework:1419859-1419961,1420512
+/manifoldcf/branches/CONNECTORS-586/framework:1477601-1477875
+/manifoldcf/branches/CONNECTORS-590/framework:1425803-1464871
+/manifoldcf/branches/CONNECTORS-590-2/framework:1464872-1465654
+/manifoldcf/branches/CONNECTORS-594/framework:1426180-1427546
+/manifoldcf/branches/CONNECTORS-63/framework:1449286-1449525
+/manifoldcf/branches/CONNECTORS-633/framework:1442813-1444626
+/manifoldcf/branches/CONNECTORS-663/framework:1455911-1457304
+/manifoldcf/branches/CONNECTORS-664/framework:1457694-1459944
+/manifoldcf/branches/CONNECTORS-676/framework:1470161-1477628
+/manifoldcf/branches/CONNECTORS-689/framework:1482853-1484123
+/manifoldcf/branches/CONNECTORS-693/framework:1487471-1488671
+/manifoldcf/branches/CONNECTORS-694/framework:1488166-1488663
+/manifoldcf/branches/CONNECTORS-703/framework:1494936-1498126
+/manifoldcf/branches/CONNECTORS-710/framework:1491769-1492603
+/manifoldcf/branches/CONNECTORS-714/framework:1492346-1493217,1493724,1493761
+/manifoldcf/branches/CONNECTORS-723/framework:1494650-1495933
+/manifoldcf/branches/CONNECTORS-727/framework:1495363-1496843
+/manifoldcf/branches/CONNECTORS-728/framework:1495840-1496915
+/manifoldcf/branches/CONNECTORS-731/framework:1499391-1501632
+/manifoldcf/branches/CONNECTORS-737/framework:1501867-1503249
+/manifoldcf/branches/CONNECTORS-754/framework:1528374-1535986
+/manifoldcf/branches/CONNECTORS-754-2/framework:1535987-1543763
+/manifoldcf/branches/CONNECTORS-772/framework:1521196-1521498,1523842-1524559
+/manifoldcf/branches/CONNECTORS-773/framework:1521767-1522759
+/manifoldcf/branches/CONNECTORS-774/framework:1521768-1523232
+/manifoldcf/branches/CONNECTORS-778/framework:1524564-1525413
+/manifoldcf/branches/CONNECTORS-781/framework:1541770-1542875,1542879-1545621,1545632-1546964,1546969-1547166,1547171-1548079,1548085-1549104
+/manifoldcf/branches/CONNECTORS-792/framework:1534965-1535981
+/manifoldcf/branches/CONNECTORS-813/framework:1544010-1544792
+/manifoldcf/branches/CONNECTORS-829/framework:1550233-1551705,1551753-1552095
+/manifoldcf/branches/CONNECTORS-833/framework:1565133-1565451
+/manifoldcf/branches/CONNECTORS-840/framework:1556412-1557896
+/manifoldcf/branches/CONNECTORS-840-2/framework:1557897-1558265
+/manifoldcf/branches/CONNECTORS-867/framework:1560403-1560560,1560679-1560840
+/manifoldcf/branches/CONNECTORS-880/framework:1564439-1564786
+/manifoldcf/branches/CONNECTORS-891/framework:1568778-1568807
+/manifoldcf/branches/CONNECTORS-911/framework:1580649-1584049,1584052-1585344
+/manifoldcf/branches/CONNECTORS-911-2/framework:1584050-1584051
+/manifoldcf/branches/CONNECTORS-912/framework:1579605-1582723
+/manifoldcf/branches/CONNECTORS-916/framework:1585365-1585526,1585532-1596719
+/manifoldcf/branches/CONNECTORS-916-2/framework:1585527-1585531
+/manifoldcf/branches/CONNECTORS-916-rebased/framework:1596720-1596721
+/manifoldcf/branches/CONNECTORS-945/framework:1597788-1597822
+/manifoldcf/branches/CONNECTORS-946/framework:1597913-1601515,1601557
+/manifoldcf/branches/CONNECTORS-954/framework:1603545-1603647,1603652-1603686,1603693-1604108
+/manifoldcf/branches/CONNECTORS-961/framework:1601696-1601881
+/manifoldcf/branches/CONNECTORS-962/framework:1602048-1602679,1602683-1603198
+/manifoldcf/branches/CONNECTORS-971/framework:1603835-1603885
+/manifoldcf/branches/CONNECTORS-980/framework:1604127-1604211
+/manifoldcf/branches/CONNECTORS-981/framework:1605049-1605773
+/manifoldcf/branches/CONNECTORS-989/framework:1611600-1612101
+/manifoldcf/branches/CONNECTORS-990/framework:1610284-1610707
+/manifoldcf/trunk:1629122
+/manifoldcf/trunk/framework:1620703,1620748,1620812,1620862,1621449,1621613,1621855,1622213,1622740,1622850,1622853-1622854,1623249,1623251,1623314,1623599,1623951,1623953-1623954,1623956,1623972,1624058,1624085,1624174,1624236,1624377,1624384,1624399,1624449,1624464,1624504,1624729-1624731,1624906,1624909-1624910,1625023,1625095,1625103,1625108,1625264,1625270,1625394,1625400,1625910,1626090,1626097,1626102,1626638-1626639,1626973,1627687,1627690,1627959,1628066,1628106,1628168,1628188,1628699,1628798,1628808,1628845,1628905,1629122,1629374-1629375,1629379,1629541,1629994,1630188,1630535,1630623,1630671,1630812,1630885,1631039,1631162,1631164,1631252

Modified: manifoldcf/branches/dev_1x/framework/api-service/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/framework/api-service/pom.xml?rev=1631727&r1=1631726&r2=1631727&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/framework/api-service/pom.xml (original)
+++ manifoldcf/branches/dev_1x/framework/api-service/pom.xml Tue Oct 14 12:09:05 2014
@@ -54,7 +54,7 @@
     <!-- web dependencies -->
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
+      <artifactId>javax.servlet-api</artifactId>
       <version>${servlet-api.version}</version>
       <scope>provided</scope>
     </dependency>
@@ -192,4 +192,4 @@
     </dependency>
 
   </dependencies>
-</project>
\ No newline at end of file
+</project>

Modified: manifoldcf/branches/dev_1x/framework/api-servlet/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/framework/api-servlet/pom.xml?rev=1631727&r1=1631726&r2=1631727&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/framework/api-servlet/pom.xml (original)
+++ manifoldcf/branches/dev_1x/framework/api-servlet/pom.xml Tue Oct 14 12:09:05 2014
@@ -54,9 +54,9 @@
     <!-- web dependencies -->
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>2.5</version>
+      <artifactId>javax.servlet-api</artifactId>
+      <version>${servlet-api.version}</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>
-</project>
\ No newline at end of file
+</project>

Modified: manifoldcf/branches/dev_1x/framework/authority-service/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/framework/authority-service/pom.xml?rev=1631727&r1=1631726&r2=1631727&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/framework/authority-service/pom.xml (original)
+++ manifoldcf/branches/dev_1x/framework/authority-service/pom.xml Tue Oct 14 12:09:05 2014
@@ -54,7 +54,7 @@
     <!-- web dependencies -->
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
+      <artifactId>javax.servlet-api</artifactId>
       <version>${servlet-api.version}</version>
       <scope>provided</scope>
     </dependency>
@@ -193,4 +193,4 @@
 
   </dependencies>
 
-</project>
\ No newline at end of file
+</project>

Modified: manifoldcf/branches/dev_1x/framework/authority-servlet/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/framework/authority-servlet/pom.xml?rev=1631727&r1=1631726&r2=1631727&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/framework/authority-servlet/pom.xml (original)
+++ manifoldcf/branches/dev_1x/framework/authority-servlet/pom.xml Tue Oct 14 12:09:05 2014
@@ -49,9 +49,9 @@
     <!-- web dependencies -->
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
+      <artifactId>javax.servlet-api</artifactId>
       <version>${servlet-api.version}</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>
-</project>
\ No newline at end of file
+</project>

Modified: manifoldcf/branches/dev_1x/framework/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/framework/build.xml?rev=1631727&r1=1631726&r2=1631727&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/framework/build.xml (original)
+++ manifoldcf/branches/dev_1x/framework/build.xml Tue Oct 14 12:09:05 2014
@@ -63,7 +63,7 @@
             <include name="jsp-api*.jar"/>
             <include name="log4j*.jar"/>
             <include name="serializer*.jar"/>
-            <include name="servlet-api*.jar"/>
+            <include name="javax.servlet-api*.jar"/>
             <include name="juli*.jar"/>
             <include name="xalan*.jar"/>
             <include name="xercesImpl*.jar"/>
@@ -901,7 +901,7 @@
                 <include name="commons-logging*.jar"/>
                 <include name="log4j*.jar"/>
                 <include name="serializer*.jar"/>
-                <include name="servlet-api*.jar"/>
+                <include name="javax.servlet-api*.jar"/>
                 <include name="xalan*.jar"/>
                 <include name="xercesImpl*.jar"/>
                 <include name="xml-apis*.jar"/>
@@ -911,7 +911,7 @@
             </fileset>
             <fileset dir="../lib">
                 <include name="jetty*.jar"/>
-                <include name="servlet-api*.jar"/>
+                <include name="javax.servlet-api*.jar"/>
                 <include name="ecj*.jar"/>
                 <include name="jasper*.jar"/>
                 <include name="juli*.jar"/>
@@ -944,39 +944,39 @@
         </copy>
     </target>
 
-    <target name="general-add-lib-classpath">
-        <replace file="${processes-dir}/options.env.win" token=".;" value=".;..\lib\${lib-jar};"/>
-        <replace file="${processes-dir}/options.env.unix" token=".:" value=".:../lib/${lib-jar}:"/>
+    <target name="general-set-classpath">
+        <replace file="${processes-dir}/options.env.win" token=".;" value=".;${win-classpath};"/>
+        <replace file="${processes-dir}/options.env.unix" token=".:" value=".:${unix-classpath}:"/>
     </target>
 
-    <target name="general-add-lib-proprietary-classpath">
-        <replace file="${processes-dir}/options.env.win" token=".;" value=".;..\lib-proprietary\${lib-proprietary-jar};"/>
-        <replace file="${processes-dir}/options.env.unix" token=".:" value=".:../lib-proprietary/${lib-proprietary-jar}:"/>
+    <target name="general-set-engine-classpath">
+        <replace file="${processes-dir}/options.env.win" token=".;" value=".;${win-classpath};"/>
+        <replace file="${processes-dir}/options.env.unix" token=".:" value=".:${unix-classpath}:"/>
     </target>
 
-    <target name="general-engine-add-lib-classpath">
-        <replace file="${processes-dir}/options.env.win" token=".;" value=".;..\lib\${lib-jar};"/>
-        <replace file="${processes-dir}/options.env.unix" token=".:" value=".:../lib/${lib-jar}:"/>
+    <target name="general-set-jetty-classpath">
+        <replace file="${processes-dir}/jetty-options.env.win" token=".;" value=".;${win-classpath};"/>
+        <replace file="${processes-dir}/jetty-options.env.unix" token=".:" value=".:${unix-classpath}:"/>
     </target>
 
-    <target name="general-jetty-add-lib-classpath">
-        <replace file="${processes-dir}/jetty-options.env.win" token=".;" value=".;..\lib\${lib-jar};"/>
-        <replace file="${processes-dir}/jetty-options.env.unix" token=".:" value=".:../lib/${lib-jar}:"/>
+    <target name="general-set-hsqldb-classpath">
+        <replace file="${processes-dir}/hsqldb-options.env.win" token=".;" value=".;${win-classpath};"/>
+        <replace file="${processes-dir}/hsqldb-options.env.unix" token=".:" value=".:${unix-classpath}:"/>
     </target>
 
-    <target name="general-jetty-add-lib-proprietary-classpath">
-        <replace file="${processes-dir}/jetty-options.env.win" token=".;" value=".;..\lib-proprietary\${lib-proprietary-jar};"/>
-        <replace file="${processes-dir}/jetty-options.env.unix" token=".:" value=".:../lib-proprietary/${lib-proprietary-jar}:"/>
+    <target name="general-set-zookeeper-classpath">
+        <replace file="${processes-dir}/zk-options.env.win" token=".;" value=".;${win-classpath};"/>
+        <replace file="${processes-dir}/zk-options.env.unix" token=".:" value=".:${unix-classpath}:"/>
     </target>
 
-    <target name="general-combined-add-lib-classpath">
-        <replace file="${processes-dir}/combined-options.env.win" token=".;" value=".;..\lib\${lib-jar};"/>
-        <replace file="${processes-dir}/combined-options.env.unix" token=".:" value=".:../lib/${lib-jar}:"/>
+    <target name="general-set-combined-classpath">
+        <replace file="${processes-dir}/combined-options.env.win" token=".;" value=".;${win-classpath};"/>
+        <replace file="${processes-dir}/combined-options.env.unix" token=".:" value=".:${unix-classpath}:"/>
     </target>
 
-    <target name="general-combined-add-lib-proprietary-classpath">
-        <replace file="${processes-dir}/combined-options.env.win" token=".;" value=".;..\lib-proprietary\${lib-proprietary-jar};"/>
-        <replace file="${processes-dir}/combined-options.env.unix" token=".:" value=".:../lib-proprietary/${lib-proprietary-jar}:"/>
+    <target name="general-set-start-classpath">
+        <replace file="${processes-dir}/start-options.env.win" token=".;" value=".;${win-classpath};"/>
+        <replace file="${processes-dir}/start-options.env.unix" token=".:" value=".:${unix-classpath}:"/>
     </target>
 
     <target name="preclean-processes">
@@ -997,12 +997,30 @@
         <delete file="${processes-dir}/jetty-options.env.unix"/>
     </target>
 
+    <target name="preclean-hsqldb-processes">
+        <mkdir dir="${processes-dir}"/>
+        <delete file="${processes-dir}/hsqldb-options.env.win"/>
+        <delete file="${processes-dir}/hsqldb-options.env.unix"/>
+    </target>
+
+    <target name="preclean-zookeeper-processes">
+        <mkdir dir="${processes-dir}"/>
+        <delete file="${processes-dir}/zk-options.env.win"/>
+        <delete file="${processes-dir}/zk-options.env.unix"/>
+    </target>
+
     <target name="preclean-combined-processes">
         <mkdir dir="${processes-dir}"/>
         <delete file="${processes-dir}/combined-options.env.win"/>
         <delete file="${processes-dir}/combined-options.env.unix"/>
     </target>
 
+    <target name="preclean-start-processes">
+        <mkdir dir="${processes-dir}"/>
+        <delete file="${processes-dir}/start-options.env.win"/>
+        <delete file="${processes-dir}/start-options.env.unix"/>
+    </target>
+
     <target name="scripts-common">
         <mkdir dir="${processes-dir}"/>
         <copy todir="${processes-dir}">
@@ -1024,6 +1042,20 @@
         </copy>
     </target>
 
+    <target name="scripts-hsqldb" depends="scripts-common">
+        <mkdir dir="${processes-dir}"/>
+        <copy todir="${processes-dir}">
+            <fileset dir="scripts-hsqldb"/>
+        </copy>
+    </target>
+
+    <target name="scripts-zookeeper" depends="scripts-common">
+        <mkdir dir="${processes-dir}"/>
+        <copy todir="${processes-dir}">
+            <fileset dir="scripts-zookeeper"/>
+        </copy>
+    </target>
+
     <target name="scripts-combined" depends="scripts-common">
         <mkdir dir="${processes-dir}"/>
         <copy todir="${processes-dir}">
@@ -1031,6 +1063,13 @@
         </copy>
     </target>
 
+    <target name="scripts-start" depends="scripts-common">
+        <mkdir dir="${processes-dir}"/>
+        <copy todir="${processes-dir}">
+            <fileset dir="scripts-start"/>
+        </copy>
+    </target>
+
     <target name="scripts-engine" depends="scripts-common">
         <mkdir dir="${processes-dir}"/>
         <copy todir="${processes-dir}">
@@ -1038,180 +1077,288 @@
         </copy>
     </target>
 
-    <target name="setup-engine-processes" depends="preclean-engine-processes,scripts-engine">
-        <antcall target="general-engine-add-lib-classpath"><param name="lib-jar" value="json.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-engine-add-lib-classpath"><param name="lib-jar" value="json-simple.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-engine-add-lib-classpath"><param name="lib-jar" value="commons-codec.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-engine-add-lib-classpath"><param name="lib-jar" value="commons-collections.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-engine-add-lib-classpath"><param name="lib-jar" value="httpcore.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-engine-add-lib-classpath"><param name="lib-jar" value="httpclient.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-engine-add-lib-classpath"><param name="lib-jar" value="commons-io.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-engine-add-lib-classpath"><param name="lib-jar" value="commons-lang.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-engine-add-lib-classpath"><param name="lib-jar" value="commons-logging.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-engine-add-lib-classpath"><param name="lib-jar" value="mcf-core.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-engine-add-lib-classpath"><param name="lib-jar" value="mcf-script-engine.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-    </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="wss4j.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-jetty-add-lib-classpath"><param name="lib-jar" value="xmlsec.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-jetty-add-lib-classpath"><param name="lib-jar" value="opensaml.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>
-        <antcall target="general-jetty-add-lib-classpath"><param name="lib-jar" value="commons-logging.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-jetty-add-lib-classpath"><param name="lib-jar" value="log4j.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-jetty-add-lib-classpath"><param name="lib-jar" value="slf4j-api.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-jetty-add-lib-classpath"><param name="lib-jar" value="slf4j-simple.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-jetty-add-lib-classpath"><param name="lib-jar" value="servlet-api.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-jetty-add-lib-classpath"><param name="lib-jar" value="ecj.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-jetty-add-lib-classpath"><param name="lib-jar" value="jetty-continuation.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-jetty-add-lib-classpath"><param name="lib-jar" value="jetty-http.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-jetty-add-lib-classpath"><param name="lib-jar" value="jetty-io.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-jetty-add-lib-classpath"><param name="lib-jar" value="jetty-jndi.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-jetty-add-lib-classpath"><param name="lib-jar" value="jetty-jsp-2.1.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-jetty-add-lib-classpath"><param name="lib-jar" value="jetty-plus.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-jetty-add-lib-classpath"><param name="lib-jar" value="jetty-security.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-jetty-add-lib-classpath"><param name="lib-jar" value="jetty-server.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-jetty-add-lib-classpath"><param name="lib-jar" value="jetty-servlet.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-jetty-add-lib-classpath"><param name="lib-jar" value="jetty-util.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-jetty-add-lib-classpath"><param name="lib-jar" value="jetty-webapp.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-jetty-add-lib-classpath"><param name="lib-jar" value="jetty-xml.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-jetty-add-lib-classpath"><param name="lib-jar" value="jasper.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-jetty-add-lib-classpath"><param name="lib-jar" value="jasper-el.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-jetty-add-lib-classpath"><param name="lib-jar" value="juli.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-jetty-add-lib-classpath"><param name="lib-jar" value="jsp-api-2.1-glassfish.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-jetty-add-lib-classpath"><param name="lib-jar" value="mcf-core.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-jetty-add-lib-classpath"><param name="lib-jar" value="mcf-ui-core.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-jetty-add-lib-classpath"><param name="lib-jar" value="mcf-agents.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-jetty-add-lib-classpath"><param name="lib-jar" value="mcf-pull-agent.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-jetty-add-lib-classpath"><param name="lib-jar" value="mcf-jetty-runner.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-    </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="wss4j.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-combined-add-lib-classpath"><param name="lib-jar" value="xmlsec.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-combined-add-lib-classpath"><param name="lib-jar" value="opensaml.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>
-        <antcall target="general-combined-add-lib-classpath"><param name="lib-jar" value="commons-logging.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-combined-add-lib-classpath"><param name="lib-jar" value="log4j.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-combined-add-lib-classpath"><param name="lib-jar" value="slf4j-api.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-combined-add-lib-classpath"><param name="lib-jar" value="slf4j-simple.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-combined-add-lib-classpath"><param name="lib-jar" value="servlet-api.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-combined-add-lib-classpath"><param name="lib-jar" value="ecj.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-combined-add-lib-classpath"><param name="lib-jar" value="jetty-continuation.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-combined-add-lib-classpath"><param name="lib-jar" value="jetty-http.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-combined-add-lib-classpath"><param name="lib-jar" value="jetty-io.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-combined-add-lib-classpath"><param name="lib-jar" value="jetty-jndi.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-combined-add-lib-classpath"><param name="lib-jar" value="jetty-jsp-2.1.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-combined-add-lib-classpath"><param name="lib-jar" value="jetty-plus.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-combined-add-lib-classpath"><param name="lib-jar" value="jetty-security.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-combined-add-lib-classpath"><param name="lib-jar" value="jetty-server.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-combined-add-lib-classpath"><param name="lib-jar" value="jetty-servlet.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-combined-add-lib-classpath"><param name="lib-jar" value="jetty-util.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-combined-add-lib-classpath"><param name="lib-jar" value="jetty-webapp.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-combined-add-lib-classpath"><param name="lib-jar" value="jetty-xml.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-combined-add-lib-classpath"><param name="lib-jar" value="jasper.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-combined-add-lib-classpath"><param name="lib-jar" value="jasper-el.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-combined-add-lib-classpath"><param name="lib-jar" value="juli.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-combined-add-lib-classpath"><param name="lib-jar" value="jsp-api-2.1-glassfish.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-combined-add-lib-classpath"><param name="lib-jar" value="mcf-core.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-combined-add-lib-classpath"><param name="lib-jar" value="mcf-ui-core.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-combined-add-lib-classpath"><param name="lib-jar" value="mcf-agents.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-combined-add-lib-classpath"><param name="lib-jar" value="mcf-pull-agent.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-combined-add-lib-classpath"><param name="lib-jar" value="mcf-jetty-runner.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-    </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="wss4j.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-add-lib-classpath"><param name="lib-jar" value="xmlsec.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-add-lib-classpath"><param name="lib-jar" value="opensaml.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>
-        <antcall target="general-add-lib-classpath"><param name="lib-jar" value="commons-codec.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-add-lib-classpath"><param name="lib-jar" value="commons-collections.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-add-lib-classpath"><param name="lib-jar" value="commons-el.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-add-lib-classpath"><param name="lib-jar" value="commons-fileupload.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-add-lib-classpath"><param name="lib-jar" value="httpcore.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-add-lib-classpath"><param name="lib-jar" value="httpclient.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-add-lib-classpath"><param name="lib-jar" value="commons-io.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-add-lib-classpath"><param name="lib-jar" value="commons-lang.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-add-lib-classpath"><param name="lib-jar" value="commons-logging.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-add-lib-classpath"><param name="lib-jar" value="log4j.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-add-lib-classpath"><param name="lib-jar" value="serializer.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-add-lib-classpath"><param name="lib-jar" value="servlet-api.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-add-lib-classpath"><param name="lib-jar" value="xalan.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-add-lib-classpath"><param name="lib-jar" value="xercesImpl.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-add-lib-classpath"><param name="lib-jar" value="xml-apis.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-add-lib-classpath"><param name="lib-jar" value="velocity.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-add-lib-classpath"><param name="lib-jar" value="slf4j-api.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-add-lib-classpath"><param name="lib-jar" value="slf4j-simple.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-add-lib-classpath"><param name="lib-jar" value="mail.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-add-lib-classpath"><param name="lib-jar" value="postgresql.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-add-lib-classpath"><param name="lib-jar" value="derby.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-add-lib-classpath"><param name="lib-jar" value="derbynet.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-add-lib-classpath"><param name="lib-jar" value="derbytools.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-add-lib-classpath"><param name="lib-jar" value="derbyLocale_cs.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-add-lib-classpath"><param name="lib-jar" value="derbyLocale_de_DE.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-add-lib-classpath"><param name="lib-jar" value="derbyLocale_es.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-add-lib-classpath"><param name="lib-jar" value="derbyLocale_fr.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-add-lib-classpath"><param name="lib-jar" value="derbyLocale_hu.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-add-lib-classpath"><param name="lib-jar" value="derbyLocale_it.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-add-lib-classpath"><param name="lib-jar" value="derbyLocale_ja_JP.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-add-lib-classpath"><param name="lib-jar" value="derbyLocale_ko_KR.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-add-lib-classpath"><param name="lib-jar" value="derbyLocale_pl.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-add-lib-classpath"><param name="lib-jar" value="derbyLocale_pt_BR.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-add-lib-classpath"><param name="lib-jar" value="derbyLocale_ru.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-add-lib-classpath"><param name="lib-jar" value="derbyLocale_zh_CN.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-add-lib-classpath"><param name="lib-jar" value="derbyLocale_zh_TW.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-add-lib-classpath"><param name="lib-jar" value="hsqldb.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-add-lib-classpath"><param name="lib-jar" value="mcf-core.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-add-lib-classpath"><param name="lib-jar" value="mcf-agents.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-add-lib-classpath"><param name="lib-jar" value="mcf-pull-agent.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
+    <!-- Paths, as used to construct script classpaths -->
+    
+    <path id="jetty-lib">
+        <fileset dir="../lib">
+            <include name="jetty*.jar"/>
+        </fileset>
+    </path>
+    
+    <path id="database-lib">
+        <fileset dir="../lib">
+            <include name="hsqldb*.jar"/>
+            <include name="postgresql*.jar"/>
+            <include name="derby*.jar"/>
+        </fileset>
+    </path>
+    
+    <path id="hsqldb-lib">
+        <fileset dir="../lib">
+            <include name="hsqldb*.jar"/>
+        </fileset>
+    </path>
+    
+    <path id="zookeeper-lib">
+        <fileset dir="../lib">
+            <include name="zookeeper*.jar"/>
+            <include name="slf4j-api*.jar"/>
+            <include name="slf4j-simple*.jar"/>
+            <include name="log4j*.jar"/>
+        </fileset>
+    </path>
+    
+    <path id="process-lib">
+        <fileset dir="../lib">
+            <include name="commons-lang*.jar"/>
+            <include name="commons-codec*.jar"/>
+            <include name="commons-collections*.jar"/>
+            <include name="commons-el*.jar"/>
+            <include name="commons-fileupload*.jar"/>
+            <include name="commons-io*.jar"/>
+            <include name="commons-logging*.jar"/>
+            <include name="commons-discovery*.jar"/>
+            <include name="jasper*.jar"/>
+            <include name="jsp-api-2.1-glassfish*.jar"/>
+            <include name="json*.jar"/>
+            <include name="log4j*.jar"/>
+            <include name="serializer*.jar"/>
+            <include name="javax.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="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>
+    </path>
+    
+    <path id="process-lib-proprietary">
+        <fileset dir="../lib-proprietary">
+            <include name="mysql-connector-java*.jar"/>
+            <include name="ojdbc*.jar"/>
+            <include name="jtds*.jar"/>
+        </fileset>
+    </path>
+    
+    <path id="engine-lib">
+        <fileset dir="../lib">
+            <include name="commons-lang*.jar"/>
+            <include name="commons-codec*.jar"/>
+            <include name="commons-collections*.jar"/>
+            <include name="commons-io*.jar"/>
+            <include name="commons-logging*.jar"/>
+            <include name="json*.jar"/>
+            <include name="httpcore*.jar"/>
+            <include name="httpclient*.jar"/>
+        </fileset>
+    </path>
+    
+    <!-- Classpaths -->
+    
+    <target name="jetty-lib-classpath" depends="lib">
+        <property name="jetty-lib-classpath" location="../lib"/>
+        <pathconvert property="jetty-lib-classpath-win" refid="jetty-lib" dirsep="\" pathsep=";">
+            <map from="${jetty-lib-classpath}" to="..\lib"/>
+        </pathconvert>
+        <pathconvert property="jetty-lib-classpath-unix" refid="jetty-lib" dirsep="/" pathsep=":">
+            <map from="${jetty-lib-classpath}" to="../lib"/>
+        </pathconvert>
+    </target>
+
+    <target name="hsqldb-lib-classpath" depends="lib">
+        <property name="hsqldb-lib-classpath" location="../lib"/>
+        <pathconvert property="hsqldb-lib-classpath-win" refid="hsqldb-lib" dirsep="\" pathsep=";">
+            <map from="${hsqldb-lib-classpath}" to="..\lib"/>
+        </pathconvert>
+        <pathconvert property="hsqldb-lib-classpath-unix" refid="hsqldb-lib" dirsep="/" pathsep=":">
+            <map from="${hsqldb-lib-classpath}" to="../lib"/>
+        </pathconvert>
+    </target>
+
+    <target name="zookeeper-lib-classpath" depends="lib">
+        <property name="zookeeper-lib-classpath" location="../lib"/>
+        <pathconvert property="zookeeper-lib-classpath-win" refid="zookeeper-lib" dirsep="\" pathsep=";">
+            <map from="${zookeeper-lib-classpath}" to="..\lib"/>
+        </pathconvert>
+        <pathconvert property="zookeeper-lib-classpath-unix" refid="zookeeper-lib" dirsep="/" pathsep=":">
+            <map from="${zookeeper-lib-classpath}" to="../lib"/>
+        </pathconvert>
+    </target>
+
+    <target name="database-lib-classpath" depends="lib">
+        <property name="database-lib-classpath" location="../lib"/>
+        <pathconvert property="database-lib-classpath-win" refid="database-lib" dirsep="\" pathsep=";">
+            <map from="${database-lib-classpath}" to="..\lib"/>
+        </pathconvert>
+        <pathconvert property="database-lib-classpath-unix" refid="database-lib" dirsep="/" pathsep=":">
+            <map from="${database-lib-classpath}" to="../lib"/>
+        </pathconvert>
+    </target>
+
+    <target name="process-lib-classpath" depends="lib">
+        <property name="process-lib-classpath" location="../lib"/>
+        <pathconvert property="process-lib-classpath-win" refid="process-lib" dirsep="\" pathsep=";">
+            <map from="${process-lib-classpath}" to="..\lib"/>
+        </pathconvert>
+        <pathconvert property="process-lib-classpath-unix" refid="process-lib" dirsep="/" pathsep=":">
+            <map from="${process-lib-classpath}" to="../lib"/>
+        </pathconvert>
+    </target>
+
+    <target name="process-lib-proprietary-classpath" depends="lib-proprietary">
+        <property name="process-lib-proprietary-classpath" location="../lib-proprietary"/>
+        <pathconvert property="process-lib-proprietary-classpath-win" refid="process-lib-proprietary" dirsep="\" pathsep=";">
+            <map from="${process-lib-proprietary-classpath}" to="..\lib"/>
+        </pathconvert>
+        <pathconvert property="process-lib-proprietary-classpath-unix" refid="process-lib-proprietary" dirsep="/" pathsep=":">
+            <map from="${process-lib-proprietary-classpath}" to="../lib"/>
+        </pathconvert>
+    </target>
+
+    <target name="engine-lib-classpath" depends="lib">
+        <property name="engine-lib-classpath" location="../lib"/>
+        <pathconvert property="engine-lib-classpath-win" refid="engine-lib" dirsep="\" pathsep=";">
+            <map from="${engine-lib-classpath}" to="..\lib"/>
+        </pathconvert>
+        <pathconvert property="engine-lib-classpath-unix" refid="engine-lib" dirsep="/" pathsep=":">
+            <map from="${engine-lib-classpath}" to="../lib"/>
+        </pathconvert>
+    </target>
+
+    <target name="jetty-lib-manifest" depends="lib">
+        <property name="jetty-lib-manifest" location="../lib"/>
+        <pathconvert property="jetty-manifest-cp" refid="jetty-lib" dirsep="/" pathsep=" ">
+            <map from="${jetty-lib-manifest}" to="../lib"/>
+        </pathconvert>
+    </target>
+
+    <target name="database-lib-manifest" depends="lib">
+        <property name="database-lib-manifest" location="../lib"/>
+        <pathconvert property="database-manifest-cp" refid="database-lib" dirsep="/" pathsep=" ">
+            <map from="${database-lib-manifest}" to="../lib"/>
+        </pathconvert>
+    </target>
+
+    <target name="process-lib-manifest" depends="lib">
+        <property name="process-lib-manifest" location="../lib"/>
+        <pathconvert property="process-manifest-cp" refid="process-lib" dirsep="/" pathsep=" ">
+            <map from="${process-lib-manifest}" to="../lib"/>
+        </pathconvert>
+    </target>
+
+    <target name="process-lib-proprietary-manifest" depends="lib-proprietary">
+        <property name="process-manifest-proprietary" location="../lib-proprietary" />
+        <pathconvert property="process-manifest-cp-proprietary" refid="process-lib-proprietary" dirsep="/" pathsep=" ">
+            <map from="${process-manifest-proprietary}" to="../lib-proprietary"/>
+        </pathconvert>
+    </target>
+
+
+    <!-- Apply classpaths to various scripts -->
+    
+    <target name="setup-engine-processes" depends="preclean-engine-processes,scripts-engine,engine-lib-classpath">
+        <antcall target="general-set-engine-classpath">
+            <param name="processes-dir" value="${processes-dir}"/>
+            <param name="win-classpath" value="..\lib\mcf-core.jar;..\lib\mcf-script-engine.jar;${engine-lib-classpath-win}"/>
+            <param name="unix-classpath" value="../lib/mcf-core.jar:../lib/mcf-script-engine.jar:${engine-lib-classpath-unix}"/>
+        </antcall>
+    </target>
+    
+    <target name="setup-jetty-processes" depends="preclean-jetty-processes,scripts-jetty,process-lib-classpath,jetty-lib-classpath">
+        <antcall target="general-set-jetty-classpath">
+            <param name="processes-dir" value="${processes-dir}"/>
+            <param name="win-classpath" value="..\lib\mcf-core.jar;..\lib\mcf-agents.jar;..\lib\mcf-pull-agent.jar;..\lib\mcf-ui-core.jar;..\lib\mcf-jetty-runner.jar;${jetty-lib-classpath-win};${process-lib-classpath-win}"/>
+            <param name="unix-classpath" value="../lib/mcf-core.jar:../lib/mcf-agents.jar:../lib/mcf-pull-agent.jar:../lib/mcf-ui-core.jar:../lib/mcf-jetty-runner.jar:${jetty-lib-classpath-unix}:${process-lib-classpath-unix}"/>
+        </antcall>
+    </target>
+
+    <target name="setup-hsqldb-processes" depends="preclean-hsqldb-processes,scripts-hsqldb,hsqldb-lib-classpath">
+        <antcall target="general-set-hsqldb-classpath">
+            <param name="processes-dir" value="${processes-dir}"/>
+            <param name="win-classpath" value="${hsqldb-lib-classpath-win}"/>
+            <param name="unix-classpath" value="${hsqldb-lib-classpath-unix}"/>
+        </antcall>
+    </target>
+
+    <target name="setup-zookeeper-processes" depends="preclean-zookeeper-processes,scripts-zookeeper,zookeeper-lib-classpath">
+        <antcall target="general-set-zookeeper-classpath">
+            <param name="processes-dir" value="${processes-dir}"/>
+            <param name="win-classpath" value="${zookeeper-lib-classpath-win}"/>
+            <param name="unix-classpath" value="${zookeeper-lib-classpath-unix}"/>
+        </antcall>
+    </target>
+
+    <target name="setup-combined-processes" depends="preclean-combined-processes,scripts-combined,process-lib-classpath,jetty-lib-classpath">
+        <antcall target="general-set-combined-classpath">
+            <param name="processes-dir" value="${processes-dir}"/>
+            <param name="win-classpath" value="..\lib\mcf-core.jar;..\lib\mcf-agents.jar;..\lib\mcf-pull-agent.jar;..\lib\mcf-ui-core.jar;..\lib\mcf-jetty-runner.jar;${jetty-lib-classpath-win};${process-lib-classpath-win}"/>
+            <param name="unix-classpath" value="../lib/mcf-core.jar:../lib/mcf-agents.jar:../lib/mcf-pull-agent.jar:../lib/mcf-ui-core.jar:../lib/mcf-jetty-runner.jar:${jetty-lib-classpath-unix}:${process-lib-classpath-unix}"/>
+        </antcall>
+    </target>
+
+    <target name="setup-start-processes" depends="preclean-start-processes,scripts-start,process-lib-classpath,database-lib-classpath,jetty-lib-classpath">
+        <antcall target="general-set-start-classpath">
+            <param name="processes-dir" value="${processes-dir}"/>
+            <param name="win-classpath" value="..\lib\mcf-core.jar;..\lib\mcf-agents.jar;..\lib\mcf-pull-agent.jar;..\lib\mcf-ui-core.jar;..\lib\mcf-jetty-runner.jar;${jetty-lib-classpath-win};${database-lib-classpath-win};${process-lib-classpath-win}"/>
+            <param name="unix-classpath" value="../lib/mcf-core.jar:../lib/mcf-agents.jar:../lib/mcf-pull-agent.jar:../lib/mcf-ui-core.jar:../lib/mcf-jetty-runner.jar:${jetty-lib-classpath-unix}:${database-lib-classpath-unix}:${process-lib-classpath-unix}"/>
+        </antcall>
+    </target>
+
+    <target name="setup-processes" depends="preclean-processes,scripts,process-lib-classpath,database-lib-classpath">
+        <antcall target="general-set-classpath">
+            <param name="processes-dir" value="${processes-dir}"/>
+            <param name="win-classpath" value="..\lib\mcf-core.jar;..\lib\mcf-agents.jar;..\lib\mcf-pull-agent.jar;${database-lib-classpath-win};${process-lib-classpath-win}"/>
+            <param name="unix-classpath" value="../lib/mcf-core.jar:../lib/mcf-agents.jar:../lib/mcf-pull-agent.jar:${database-lib-classpath-unix}:${process-lib-classpath-unix}"/>
+        </antcall>
     </target>
 
     <target name="setup-jetty-processes-proprietary" depends="setup-jetty-processes">
     </target>
 
+    <target name="setup-hsqldb-processes-proprietary" depends="setup-hsqldb-processes">
+    </target>
+
+    <target name="setup-zookeeper-processes-proprietary" depends="setup-zookeeper-processes">
+    </target>
+
     <target name="setup-combined-processes-proprietary" depends="setup-combined-processes">
     </target>
 
-    <target name="setup-processes-proprietary" depends="setup-processes">
-        <antcall target="general-add-lib-proprietary-classpath"><param name="lib-proprietary-jar" value="mysql-connector-java.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-add-lib-proprietary-classpath"><param name="lib-proprietary-jar" value="ojdbc.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
-        <antcall target="general-add-lib-proprietary-classpath"><param name="lib-proprietary-jar" value="jtds.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
+    <target name="setup-start-processes-proprietary" depends="preclean-start-processes,scripts-start,process-lib-classpath,process-lib-proprietary-classpath,database-lib-classpath,jetty-lib-classpath">
+        <antcall target="general-set-start-classpath">
+            <param name="processes-dir" value="${processes-dir}"/>
+            <param name="win-classpath" value="..\lib\mcf-core.jar;..\lib\mcf-agents.jar;..\lib\mcf-pull-agent.jar;..\lib\mcf-ui-core.jar;..\lib\mcf-jetty-runner.jar;${jetty-lib-classpath-win};${database-lib-classpath-win};${process-lib-proprietary-classpath-win};${process-lib-classpath-win}"/>
+            <param name="unix-classpath" value="../lib/mcf-core.jar:../lib/mcf-agents.jar:../lib/mcf-pull-agent.jar:../lib/mcf-ui-core.jar:../lib/mcf-jetty-runner.jar:${jetty-lib-classpath-unix}:${database-lib-classpath-unix}:${process-lib-proprietary-classpath-unix}:${process-lib-classpath-unix}"/>
+        </antcall>
+    </target>
+
+    <target name="setup-processes-proprietary" depends="preclean-processes,scripts,process-lib-classpath,database-lib-classpath,process-lib-proprietary-classpath">
+        <antcall target="general-set-classpath">
+            <param name="processes-dir" value="${processes-dir}"/>
+            <param name="win-classpath" value="..\lib\mcf-core.jar;..\lib\mcf-agents.jar;..\lib\mcf-pull-agent.jar;${database-lib-classpath-win};${process-lib-classpath-win};${process-lib-proprietary-classpath-win}"/>
+            <param name="unix-classpath" value="../lib/mcf-core.jar:../lib/mcf-agents.jar:../lib/mcf-pull-agent.jar:${database-lib-classpath-unix}:${process-lib-classpath-unix}:${process-lib-proprietary-classpath-unix}"/>
+        </antcall>
     </target>
 
+    <!-- Set up example directories -->
+    
     <target name="example-common" depends="wars,wars-proprietary">
         <copy file="example-common/connectors.xml" tofile="dist/connectors.xml"/>
         <copy file="example-common/connectors.xml" tofile="dist/connectors-proprietary.xml"/>
@@ -1252,6 +1399,9 @@
         <antcall target="setup-jetty-processes">
             <param name="processes-dir" value="dist/multiprocess-file-example"/>
         </antcall>
+        <antcall target="setup-hsqldb-processes">
+            <param name="processes-dir" value="dist/multiprocess-file-example"/>
+        </antcall>
 
         <mkdir dir="dist/multiprocess-file-example"/>
         <copy todir="dist/multiprocess-file-example">
@@ -1259,6 +1409,7 @@
                 <include name="logging.ini"/>
                 <include name="*.sh"/>
                 <include name="*.bat"/>
+                <include name="*.xml"/>
             </fileset>
             <fileset dir="example-multiprocess-file-common">
                 <include name="*.sh"/>
@@ -1277,12 +1428,16 @@
         <antcall target="setup-jetty-processes-proprietary">
             <param name="processes-dir" value="dist/multiprocess-file-example-proprietary"/>
         </antcall>
+        <antcall target="setup-hsqldb-processes-proprietary">
+            <param name="processes-dir" value="dist/multiprocess-file-example-proprietary"/>
+        </antcall>
         <mkdir dir="dist/multiprocess-file-example-proprietary"/>
         <copy todir="dist/multiprocess-file-example-proprietary">
             <fileset dir="example-multiprocess-common">
                 <include name="logging.ini"/>
                 <include name="*.sh"/>
                 <include name="*.bat"/>
+                <include name="*.xml"/>
             </fileset>
             <fileset dir="example-multiprocess-file-common">
                 <include name="*.sh"/>
@@ -1300,12 +1455,19 @@
         <antcall target="setup-jetty-processes">
             <param name="processes-dir" value="dist/multiprocess-zk-example"/>
         </antcall>
+        <antcall target="setup-hsqldb-processes">
+            <param name="processes-dir" value="dist/multiprocess-zk-example"/>
+        </antcall>
+        <antcall target="setup-zookeeper-processes">
+            <param name="processes-dir" value="dist/multiprocess-zk-example"/>
+        </antcall>
         <mkdir dir="dist/multiprocess-zk-example"/>
         <copy todir="dist/multiprocess-zk-example">
             <fileset dir="example-multiprocess-common">
                 <include name="logging.ini"/>
                 <include name="*.sh"/>
                 <include name="*.bat"/>
+                <include name="*.xml"/>
             </fileset>
             <fileset dir="example-multiprocess-zk-common">
                 <include name="*.sh"/>
@@ -1325,12 +1487,19 @@
         <antcall target="setup-jetty-processes-proprietary">
             <param name="processes-dir" value="dist/multiprocess-zk-example-proprietary"/>
         </antcall>
+        <antcall target="setup-hsqldb-processes-proprietary">
+            <param name="processes-dir" value="dist/multiprocess-zk-example-proprietary"/>
+        </antcall>
+        <antcall target="setup-zookeeper-processes-proprietary">
+            <param name="processes-dir" value="dist/multiprocess-zk-example-proprietary"/>
+        </antcall>
         <mkdir dir="dist/multiprocess-zk-example-proprietary"/>
         <copy todir="dist/multiprocess-zk-example-proprietary">
             <fileset dir="example-multiprocess-common">
                 <include name="logging.ini"/>
                 <include name="*.sh"/>
                 <include name="*.bat"/>
+                <include name="*.xml"/>
             </fileset>
             <fileset dir="example-multiprocess-zk-common">
                 <include name="*.sh"/>
@@ -1356,213 +1525,66 @@
         <chmod dir="dist/script-engine" perm="a+x" includes="**/*.sh"/>
     </target>
     
-    <target name="single-process-example" depends="lib">
+    <target name="single-process-start-jar" depends="process-lib-manifest,jetty-lib-manifest,database-lib-manifest">
+        <mkdir dir="build/example"/>
+        <manifest file="build/example/manifest">
+            <attribute name="Main-Class" value="org.apache.manifoldcf.jettyrunner.ManifoldCFJettyRunner"/>
+            <attribute name="Class-Path" value="../lib/mcf-core.jar ../lib/mcf-agents.jar ../lib/mcf-pull-agent.jar ../lib/mcf-ui-core.jar ../lib/mcf-jetty-runner.jar ${database-manifest-cp} ${process-manifest-cp} ${jetty-manifest-cp}"/>
+        </manifest>
+        <jar destfile="dist/example/start.jar" manifest="build/example/manifest"/>
+    </target>
+    
+    <target name="single-process-example" depends="single-process-start-jar">
         <antcall target="setup-combined-processes">
             <param name="processes-dir" value="dist/example"/>
         </antcall>
+        <antcall target="setup-start-processes">
+            <param name="processes-dir" value="dist/example"/>
+        </antcall>
         <mkdir dir="dist/example/logs"/>
         <copy todir="dist/example">
             <fileset dir="example-singleprocess-common">
                 <include name="logging.ini"/>
                 <include name="*.sh"/>
                 <include name="*.bat"/>
+                <include name="*.xml"/>
             </fileset>
             <fileset dir="example-singleprocess">
                 <include name="properties.xml"/>
             </fileset>
         </copy>
         
-        <!-- 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-10" value="${manifest-cp-9} ../lib/derbyclient.jar"/>
-        <property name="manifest-cp-11" value="${manifest-cp-10} ../lib/derby.jar"/>
-        <property name="manifest-cp-12" value="${manifest-cp-11} ../lib/derbyLocale_cs.jar"/>
-        <property name="manifest-cp-13" value="${manifest-cp-12} ../lib/derbyLocale_de_DE.jar"/>
-        <property name="manifest-cp-14" value="${manifest-cp-13} ../lib/derbyLocale_es.jar"/>
-        <property name="manifest-cp-15" value="${manifest-cp-14} ../lib/derbyLocale_fr.jar"/>
-        <property name="manifest-cp-16" value="${manifest-cp-15} ../lib/derbyLocale_hu.jar"/>
-        <property name="manifest-cp-17" value="${manifest-cp-16} ../lib/derbyLocale_it.jar"/>
-        <property name="manifest-cp-18" value="${manifest-cp-17} ../lib/derbyLocale_ja_JP"/>
-        <property name="manifest-cp-19" value="${manifest-cp-18} ../lib/derbyLocale_ko_KR.jar"/>
-        <property name="manifest-cp-20" value="${manifest-cp-19} ../lib/derbyLocale_pl.jar"/>
-        <property name="manifest-cp-21" value="${manifest-cp-20} ../lib/derbyLocale_pt_BR.jar"/>
-        <property name="manifest-cp-22" value="${manifest-cp-21} ../lib/derbyLocale_ru.jar"/>
-        <property name="manifest-cp-23" value="${manifest-cp-22} ../lib/derbyLocale_zh_CN.jar"/>
-        <property name="manifest-cp-24" value="${manifest-cp-23} ../lib/derbyLocale_zh_TW.jar"/>
-        <property name="manifest-cp-25" value="${manifest-cp-24} ../lib/derbyrun.jar"/>
-        <property name="manifest-cp-26" value="${manifest-cp-25} ../lib/derbytools.jar"/>
-        <property name="manifest-cp-27" value="${manifest-cp-26} ../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-48" value="${manifest-cp-47} ../lib/derbynet.jar"/>
-        <property name="manifest-cp-49" value="${manifest-cp-48} ../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"/>
+        <chmod dir="dist/example" perm="a+x" includes="**/*.sh"/>
+    </target>
 
-        <property name="manifest-cp" value="${manifest-cp-75}"/>
-        <mkdir dir="build/example"/>
-        <manifest file="build/example/manifest">
+    <target name="single-process-start-jar-proprietary" depends="process-lib-manifest,jetty-lib-manifest,process-lib-proprietary-manifest,database-lib-manifest">
+        <mkdir dir="build/example-proprietary"/>
+        <manifest file="build/example-proprietary/manifest">
             <attribute name="Main-Class" value="org.apache.manifoldcf.jettyrunner.ManifoldCFJettyRunner"/>
-            <attribute name="Class-Path" value="${manifest-cp}"/>
+            <attribute name="Class-Path" value="../lib/mcf-core.jar ../lib/mcf-agents.jar ../lib/mcf-pull-agent.jar ../lib/mcf-ui-core.jar ../lib/mcf-jetty-runner.jar ${database-lib-manifest} ${process-manifest-cp} ${jetty-manifest-cp} ${process-manifest-cp-proprietary}"/>
         </manifest>
-        <jar destfile="dist/example/start.jar" manifest="build/example/manifest"/>
-        <chmod dir="dist/example" perm="a+x" includes="**/*.sh"/>
-
+        <jar destfile="dist/example-proprietary/start.jar" manifest="build/example-proprietary/manifest"/>
     </target>
-
-    <target name="single-process-example-proprietary" depends="lib,lib-proprietary">
+    
+    <target name="single-process-example-proprietary" depends="single-process-start-jar-proprietary">
         <antcall target="setup-combined-processes-proprietary">
             <param name="processes-dir" value="dist/example-proprietary"/>
         </antcall>
+        <antcall target="setup-start-processes-proprietary">
+            <param name="processes-dir" value="dist/example-proprietary"/>
+        </antcall>
         <mkdir dir="dist/example-proprietary/logs"/>
         <copy todir="dist/example-proprietary">
             <fileset dir="example-singleprocess-common">
                 <include name="logging.ini"/>
                 <include name="*.sh"/>
                 <include name="*.bat"/>
+                <include name="*.xml"/>
             </fileset>
             <fileset dir="example-singleprocess-proprietary">
                 <include name="properties.xml"/>
             </fileset>
         </copy>
-        
-        <!-- 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-10" value="${manifest-cp-proprietary-9} ../lib/derbyclient.jar"/>
-        <property name="manifest-cp-proprietary-11" value="${manifest-cp-proprietary-10} ../lib/derby.jar"/>
-        <property name="manifest-cp-proprietary-12" value="${manifest-cp-proprietary-11} ../lib/derbyLocale_cs.jar"/>
-        <property name="manifest-cp-proprietary-13" value="${manifest-cp-proprietary-12} ../lib/derbyLocale_de_DE.jar"/>
-        <property name="manifest-cp-proprietary-14" value="${manifest-cp-proprietary-13} ../lib/derbyLocale_es.jar"/>
-        <property name="manifest-cp-proprietary-15" value="${manifest-cp-proprietary-14} ../lib/derbyLocale_fr.jar"/>
-        <property name="manifest-cp-proprietary-16" value="${manifest-cp-proprietary-15} ../lib/derbyLocale_hu.jar"/>
-        <property name="manifest-cp-proprietary-17" value="${manifest-cp-proprietary-16} ../lib/derbyLocale_it.jar"/>
-        <property name="manifest-cp-proprietary-18" value="${manifest-cp-proprietary-17} ../lib/derbyLocale_ja_JP"/>
-        <property name="manifest-cp-proprietary-19" value="${manifest-cp-proprietary-18} ../lib/derbyLocale_ko_KR.jar"/>
-        <property name="manifest-cp-proprietary-20" value="${manifest-cp-proprietary-19} ../lib/derbyLocale_pl.jar"/>
-        <property name="manifest-cp-proprietary-21" value="${manifest-cp-proprietary-20} ../lib/derbyLocale_pt_BR.jar"/>
-        <property name="manifest-cp-proprietary-22" value="${manifest-cp-proprietary-21} ../lib/derbyLocale_ru.jar"/>
-        <property name="manifest-cp-proprietary-23" value="${manifest-cp-proprietary-22} ../lib/derbyLocale_zh_CN.jar"/>
-        <property name="manifest-cp-proprietary-24" value="${manifest-cp-proprietary-23} ../lib/derbyLocale_zh_TW.jar"/>
-        <property name="manifest-cp-proprietary-25" value="${manifest-cp-proprietary-24} ../lib/derbyrun.jar"/>
-        <property name="manifest-cp-proprietary-26" value="${manifest-cp-proprietary-25} ../lib/derbytools.jar"/>
-        <property name="manifest-cp-proprietary-27" value="${manifest-cp-proprietary-26} ../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-48" value="${manifest-cp-proprietary-47} ../lib/derbynet.jar"/>
-        <property name="manifest-cp-proprietary-49" value="${manifest-cp-proprietary-48} ../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"/>
-        
-        <property name="manifest-cp-proprietary" value="${manifest-cp-proprietary-77}"/>
-        <mkdir dir="build/example-proprietary"/>
-        <manifest file="build/example-proprietary/manifest">
-            <attribute name="Main-Class" value="org.apache.manifoldcf.jettyrunner.ManifoldCFJettyRunner"/>
-            <attribute name="Class-Path" value="${manifest-cp-proprietary}"/>
-        </manifest>
-        <jar destfile="dist/example-proprietary/start.jar" manifest="build/example-proprietary/manifest"/>
         <chmod dir="dist/example-proprietary" perm="a+x" includes="**/*.sh"/>
     </target>
 

Modified: manifoldcf/branches/dev_1x/framework/buildfiles/connector-build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/framework/buildfiles/connector-build.xml?rev=1631727&r1=1631726&r2=1631727&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/framework/buildfiles/connector-build.xml (original)
+++ manifoldcf/branches/dev_1x/framework/buildfiles/connector-build.xml Tue Oct 14 12:09:05 2014
@@ -24,7 +24,7 @@
     </target>
     
     <target name="download-via-maven" depends="setup-maven-url">
-        <get src="${maven-base-url}/${project-path}/${artifact-name}/${artifact-version}/${artifact-name}-${artifact-version}.${artifact-type}" dest="${target}/${artifact-name}.${artifact-type}"/>
+        <get src="${maven-base-url}/${project-path}/${artifact-name}/${artifact-version}/${artifact-name}-${artifact-version}.${artifact-type}" dest="${target}/${artifact-name}-${artifact-version}.${artifact-type}"/>
     </target>
 
     <target name="checkout-source-via-svn">
@@ -133,7 +133,7 @@
             <include name="junit*.jar"/>
             <include name="log4j*.jar"/>
             <include name="serializer*.jar"/>
-            <include name="servlet-api*.jar"/>
+            <include name="javax.servlet-api*.jar"/>
             <include name="tomcat-juli*.jar"/>
             <include name="xalan*.jar"/>
             <include name="xercesImpl*.jar"/>
@@ -686,22 +686,22 @@
     </target>
 
     <target name="general-connector-delivery-integration" depends="general-connector-integration-check" if="has-integration">
-        <mkdir dir="${mcf-dist}/${ant.project.name}-integration"/>
-        <copy todir="${mcf-dist}/${ant.project.name}-integration">
+        <mkdir dir="${mcf-dist}/plugins/${ant.project.name}"/>
+        <copy todir="${mcf-dist}/plugins/${ant.project.name}">
             <fileset dir="dist/integration"/>
         </copy>
     </target>
 
     <target name="general-delivery-server-process" depends="general-server-process-check" if="has-server-process">
-        <mkdir dir="${mcf-dist}/${ant.project.name}-server-process"/>
-        <copy todir="${mcf-dist}/${ant.project.name}-server-process">
+        <mkdir dir="${mcf-dist}/processes/${ant.project.name}-server"/>
+        <copy todir="${mcf-dist}/processes/${ant.project.name}-server">
             <fileset dir="dist/server-process"/>
         </copy>
     </target>
 
     <target name="general-delivery-registry-process" depends="general-registry-process-check" if="has-registry-process">
-        <mkdir dir="${mcf-dist}/${ant.project.name}-registry-process"/>
-        <copy todir="${mcf-dist}/${ant.project.name}-registry-process">
+        <mkdir dir="${mcf-dist}/processes/${ant.project.name}-registry"/>
+        <copy todir="${mcf-dist}/processes/${ant.project.name}-registry">
             <fileset dir="dist/registry-process"/>
         </copy>
     </target>

Modified: manifoldcf/branches/dev_1x/framework/combined-service/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/framework/combined-service/pom.xml?rev=1631727&r1=1631726&r2=1631727&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/framework/combined-service/pom.xml (original)
+++ manifoldcf/branches/dev_1x/framework/combined-service/pom.xml Tue Oct 14 12:09:05 2014
@@ -71,7 +71,7 @@
     <!-- web dependencies -->
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
+      <artifactId>javax.servlet-api</artifactId>
       <version>${servlet-api.version}</version>
       <scope>provided</scope>
     </dependency>
@@ -249,4 +249,4 @@
       </plugin>
     </plugins>
   </build>
-</project>
\ No newline at end of file
+</project>



Mime
View raw message