You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2011/12/14 04:32:50 UTC
svn commit: r1214041 - in /incubator/lcf/branches/CONNECTORS-313: ./
framework/ framework/example-common/ framework/example-multiprocess/
framework/example-singleprocess/ framework/jetty-example/
Author: kwright
Date: Wed Dec 14 03:32:50 2011
New Revision: 1214041
URL: http://svn.apache.org/viewvc?rev=1214041&view=rev
Log:
Separate out single-process (example) from multi-process (multi) areas in dist, and share connectors.xml and connector-lib between the two.
Added:
incubator/lcf/branches/CONNECTORS-313/framework/example-common/
incubator/lcf/branches/CONNECTORS-313/framework/example-common/connectors.xml
- copied unchanged from r1214022, incubator/lcf/branches/CONNECTORS-313/framework/jetty-example/connectors.xml
incubator/lcf/branches/CONNECTORS-313/framework/example-multiprocess/
incubator/lcf/branches/CONNECTORS-313/framework/example-multiprocess/logging.ini
- copied unchanged from r1214022, incubator/lcf/branches/CONNECTORS-313/framework/jetty-example/logging.ini
incubator/lcf/branches/CONNECTORS-313/framework/example-multiprocess/properties.xml
- copied, changed from r1214022, incubator/lcf/branches/CONNECTORS-313/framework/jetty-example/properties.xml
incubator/lcf/branches/CONNECTORS-313/framework/example-singleprocess/
- copied from r1214022, incubator/lcf/branches/CONNECTORS-313/framework/jetty-example/
incubator/lcf/branches/CONNECTORS-313/framework/example-singleprocess/logging.ini
- copied unchanged from r1214022, incubator/lcf/branches/CONNECTORS-313/framework/jetty-example/logging.ini
Removed:
incubator/lcf/branches/CONNECTORS-313/framework/example-singleprocess/connectors.xml
incubator/lcf/branches/CONNECTORS-313/framework/jetty-example/
Modified:
incubator/lcf/branches/CONNECTORS-313/build.xml
incubator/lcf/branches/CONNECTORS-313/framework/build.xml
incubator/lcf/branches/CONNECTORS-313/framework/example-singleprocess/properties.xml
Modified: incubator/lcf/branches/CONNECTORS-313/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-313/build.xml?rev=1214041&r1=1214040&r2=1214041&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-313/build.xml (original)
+++ incubator/lcf/branches/CONNECTORS-313/build.xml Wed Dec 14 03:32:50 2011
@@ -1178,19 +1178,41 @@
</copy>
</target>
- <target name="deliver-framework" depends="build-framework">
- <mkdir dir="dist/processes"/>
- <copy todir="dist/processes">
- <fileset dir="framework/dist/processes"/>
+ <target name="preclean-for-delivery">
+ <mkdir dir="dist"/>
+ <delete file="dist/connectors.xml"/>
+ <delete file="dist/example/properties.xml"/>
+ <delete file="dist/multi/properties.xml"/>
+ </target>
+
+ <target name="deliver-framework" depends="preclean-for-delivery,build-framework">
+ <mkdir dir="dist/multi"/>
+ <copy todir="dist/multi">
+ <fileset dir="framework/dist/multi"/>
+ </copy>
+ <mkdir dir="dist/example"/>
+ <copy todir="dist/example">
+ <fileset dir="framework/dist/example"/>
</copy>
<mkdir dir="dist/script-engine"/>
<copy todir="dist/script-engine">
<fileset dir="framework/dist/script-engine"/>
</copy>
- <mkdir dir="dist/web"/>
- <copy todir="dist/web">
- <fileset dir="framework/dist/web"/>
+ <mkdir dir="dist"/>
+ <copy todir="dist">
+ <fileset dir="framework/dist">
+ <include name="connectors.xml"/>
+ </fileset>
</copy>
+ <mkdir dir="dist/multi/syncharea"/>
+ <!-- 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. -->
+ <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/commons-codec.jar lib/commons-collections.jar lib/commons-el.jar lib/commons-fileupload.jar lib/commons-httpclient-mcf.jar lib/commons-io.jar lib/commons-logging.jar lib/hsqldb.jar lib/derbyclient.jar lib/derby.jar lib/derbyLocale_cs.jar lib/derbyLocale_de_DE.jar lib/derbyLocale_es.jar lib/derbyLocale_fr.jar lib/derbyLocale_hu.jar lib/derbyLocale_it.jar lib/derbyLocale_ja_JP.jar lib/derbyLocale_ko_KR.jar lib/derbyLocale_pl.jar lib/derbyLocale_pt_BR.jar lib/derbyLocale_ru.jar lib/derbyLocale_zh_CN.jar lib/derbyLocale_zh_TW.jar lib/derbynet.jar lib/derbyrun.jar lib/derbytools.jar lib/eclipse-ecj.jar lib/jasper-6.0.24.jar lib/jasper-el-6.0.24.jar lib/jdbcpool-0.99.jar lib/jetty-6.1.26-patched-JETTY-1340.jar lib/jetty-util-6.1.26-patched-JETTY-1340.jar lib/jsp-api-2.1-glassfish-2.1.v20091210.jar lib/json.jar lib/mcf-agents.jar lib/mcf-core.jar lib/mcf-jetty-runner.jar lib/mcf-pull-agent.jar lib/mcf-ui-core.jar lib/log4j-1.2.jar
lib/postgresql.jar lib/serializer.jar lib/servlet-api-2.5-20081211.jar lib/tomcat-juli-6.0.24.jar lib/xalan2.jar lib/xercesImpl-mcf.jar lib/xml-apis.jar"/>
+ </manifest>
+ <jar destfile="dist/example/start.jar" manifest="build/example/manifest"/>
</target>
<target name="deliver-framework-doc" depends="doc-framework">
@@ -1215,10 +1237,11 @@
</target>
<target name="deliver-activedirectory-connector" depends="calculate-activedirectory-condition" if="activedirectory.include">
- <mkdir dir="dist/lib"/>
- <copy todir="dist/lib">
+ <mkdir dir="dist/connector-lib"/>
+ <copy todir="dist/connector-lib">
<fileset dir="connectors/activedirectory/dist/lib"/>
</copy>
+ <replace file="dist/connectors.xml" token="<!-- Add your authority connectors here -->" value="<!-- Add your authority connectors here -->
 <authorityconnector name="Active Directory" class="org.apache.manifoldcf.authorities.authorities.activedirectory.ActiveDirectoryAuthority"/>"/>
</target>
<target name="deliver-activedirectory-connector-doc" depends="calculate-activedirectory-doc-condition" if="activedirectory-doc.include">
@@ -1253,10 +1276,11 @@
</target>
<target name="deliver-alfresco-connector" depends="calculate-alfresco-condition" if="alfresco.include">
- <mkdir dir="dist/lib"/>
- <copy todir="dist/lib">
+ <mkdir dir="dist/connector-lib"/>
+ <copy todir="dist/connector-lib">
<fileset dir="connectors/alfresco/dist/lib"/>
</copy>
+ <replace file="dist/connectors.xml" token="<!-- Add your repository connectors here -->" value="<!-- Add your repository connectors here -->
 <repositoryconnector name="Alfresco" class="org.apache.manifoldcf.crawler.connectors.alfresco.AlfrescoRepositoryConnector"/>"/>
</target>
<target name="deliver-alfresco-connector-doc" depends="calculate-alfresco-doc-condition" if="alfresco-doc.include">
@@ -1281,10 +1305,12 @@
</target>
<target name="deliver-cmis-connector" depends="calculate-cmis-condition" if="cmis.include">
- <mkdir dir="dist/lib"/>
- <copy todir="dist/lib">
+ <mkdir dir="dist/connector-lib"/>
+ <copy todir="dist/connector-lib">
<fileset dir="connectors/cmis/dist/lib"/>
</copy>
+ <replace file="dist/connectors.xml" token="<!-- Add your repository connectors here -->" value="<!-- Add your repository connectors here -->
 <repositoryconnector name="CMIS" class="org.apache.manifoldcf.crawler.connectors.cmis.CmisRepositoryConnector"/>"/>
+ <replace file="dist/connectors.xml" token="<!-- Add your authority connectors here -->" value="<!-- Add your authority connectors here -->
 <authorityconnector name="CMIS" class="org.apache.manifoldcf.crawler.connectors.cmis.CmisAuthorityConnector"/>"/>
</target>
<target name="deliver-cmis-connector-doc" depends="calculate-cmis-doc-condition" if="cmis-doc.include">
@@ -1309,8 +1335,8 @@
</target>
<target name="deliver-documentum-connector" depends="calculate-documentum-condition" if="documentum.include">
- <mkdir dir="dist/lib"/>
- <copy todir="dist/lib">
+ <mkdir dir="dist/connector-lib"/>
+ <copy todir="dist/connector-lib">
<fileset dir="connectors/documentum/dist/lib"/>
</copy>
<mkdir dir="dist/documentum-server-process"/>
@@ -1321,6 +1347,8 @@
<copy todir="dist/documentum-registry-process">
<fileset dir="connectors/documentum/dist/registry-process"/>
</copy>
+ <replace file="dist/connectors.xml" token="<!-- Add your authority connectors here -->" value="<!-- Add your authority connectors here -->
 <authorityconnector name="Documentum" class="org.apache.manifoldcf.crawler.authorities.DCTM.AuthorityConnector"/>"/>
+ <replace file="dist/connectors.xml" token="<!-- Add your repository connectors here -->" value="<!-- Add your repository connectors here -->
 <repositoryconnector name="Documentum" class="org.apache.manifoldcf.crawler.connectors.DCTM.DCTM"/>"/>
</target>
<target name="deliver-documentum-connector-doc" depends="calculate-documentum-doc-condition" if="documentum-doc.include">
@@ -1345,8 +1373,8 @@
</target>
<target name="deliver-filenet-connector" depends="calculate-filenet-condition" if="filenet.include">
- <mkdir dir="dist/lib"/>
- <copy todir="dist/lib">
+ <mkdir dir="dist/connector-lib"/>
+ <copy todir="dist/connector-lib">
<fileset dir="connectors/filenet/dist/lib"/>
</copy>
<mkdir dir="dist/filenet-server-process"/>
@@ -1357,6 +1385,7 @@
<copy todir="dist/filenet-registry-process">
<fileset dir="connectors/filenet/dist/registry-process"/>
</copy>
+ <replace file="dist/connectors.xml" token="<!-- Add your repository connectors here -->" value="<!-- Add your repository connectors here -->
 <repositoryconnector name="FileNet" class="org.apache.manifoldcf.crawler.connectors.filenet.FilenetConnector"/>"/>
</target>
<target name="deliver-filenet-connector-doc" depends="calculate-filenet-doc-condition" if="filenet-doc.include">
@@ -1381,10 +1410,11 @@
</target>
<target name="deliver-filesystem-connector" depends="calculate-filesystem-condition" if="filesystem.include">
- <mkdir dir="dist/lib"/>
- <copy todir="dist/lib">
+ <mkdir dir="dist/connector-lib"/>
+ <copy todir="dist/connector-lib">
<fileset dir="connectors/filesystem/dist/lib"/>
</copy>
+ <replace file="dist/connectors.xml" token="<!-- Add your repository connectors here -->" value="<!-- Add your repository connectors here -->
 <repositoryconnector name="File system" class="org.apache.manifoldcf.crawler.connectors.filesystem.FileConnector"/>"/>
</target>
<target name="deliver-filesystem-connector-doc" depends="calculate-filesystem-doc-condition" if="filesystem-doc.include">
@@ -1409,10 +1439,11 @@
</target>
<target name="deliver-gts-connector" depends="calculate-gts-condition" if="gts.include">
- <mkdir dir="dist/lib"/>
- <copy todir="dist/lib">
+ <mkdir dir="dist/connector-lib"/>
+ <copy todir="dist/connector-lib">
<fileset dir="connectors/gts/dist/lib"/>
</copy>
+ <replace file="dist/connectors.xml" token="<!-- Add your output connectors here -->" value="<!-- Add your output connectors here -->
 <outputconnector name="MetaCarta GTS" class="org.apache.manifoldcf.agents.output.gts.GTSConnector"/>"/>
</target>
<target name="deliver-gts-connector-doc" depends="calculate-gts-doc-condition" if="gts-doc.include">
@@ -1437,10 +1468,11 @@
</target>
<target name="deliver-jdbc-connector" depends="calculate-jdbc-condition" if="jdbc.include">
- <mkdir dir="dist/lib"/>
- <copy todir="dist/lib">
+ <mkdir dir="dist/connector-lib"/>
+ <copy todir="dist/connector-lib">
<fileset dir="connectors/jdbc/dist/lib"/>
</copy>
+ <replace file="dist/connectors.xml" token="<!-- Add your repository connectors here -->" value="<!-- Add your repository connectors here -->
 <repositoryconnector name="JDBC" class="org.apache.manifoldcf.crawler.connectors.jdbc.JDBCConnector"/>"/>
</target>
<target name="deliver-jdbc-connector-doc" depends="calculate-jdbc-doc-condition" if="jdbc-doc.include">
@@ -1465,10 +1497,11 @@
</target>
<target name="deliver-jcifs-connector" depends="calculate-jcifs-condition" if="jcifs.include">
- <mkdir dir="dist/lib"/>
- <copy todir="dist/lib">
+ <mkdir dir="dist/connector-lib"/>
+ <copy todir="dist/connector-lib">
<fileset dir="connectors/jcifs/dist/lib"/>
</copy>
+ <replace file="dist/connectors.xml" token="<!-- Add your repository connectors here -->" value="<!-- Add your repository connectors here -->
 <repositoryconnector name="Windows shares" class="org.apache.manifoldcf.crawler.connectors.sharedrive.SharedDriveConnector"/>"/>
</target>
<target name="deliver-jcifs-connector-doc" depends="calculate-jcifs-doc-condition" if="jcifs-doc.include">
@@ -1493,10 +1526,12 @@
</target>
<target name="deliver-livelink-connector" depends="calculate-livelink-condition" if="livelink.include">
- <mkdir dir="dist/lib"/>
- <copy todir="dist/lib">
+ <mkdir dir="dist/connector-lib"/>
+ <copy todir="dist/connector-lib">
<fileset dir="connectors/livelink/dist/lib"/>
</copy>
+ <replace file="dist/connectors.xml" token="<!-- Add your authority connectors here -->" value="<!-- Add your authority connectors here -->
 <authorityconnector name="LiveLink" class="org.apache.manifoldcf.crawler.connectors.livelink.LivelinkAuthority"/>"/>
+ <replace file="dist/connectors.xml" token="<!-- Add your repository connectors here -->" value="<!-- Add your repository connectors here -->
 <repositoryconnector name="LiveLink" class="org.apache.manifoldcf.crawler.connectors.livelink.LivelinkConnector"/>"/>
</target>
<target name="deliver-livelink-connector-doc" depends="calculate-livelink-doc-condition" if="livelink-doc.include">
@@ -1521,14 +1556,15 @@
</target>
<target name="deliver-solr-connector" depends="calculate-solr-condition" if="solr.include">
- <mkdir dir="dist/lib"/>
- <copy todir="dist/lib">
+ <mkdir dir="dist/connector-lib"/>
+ <copy todir="dist/connector-lib">
<fileset dir="connectors/solr/dist/lib"/>
</copy>
<mkdir dir="dist/solr-integration"/>
<copy todir="dist/solr-integration">
<fileset dir="connectors/solr/dist/integration"/>
</copy>
+ <replace file="dist/connectors.xml" token="<!-- Add your output connectors here -->" value="<!-- Add your output connectors here -->
 <outputconnector name="Solr" class="org.apache.manifoldcf.agents.output.solr.SolrConnector"/>"/>
</target>
<target name="deliver-solr-connector-doc" depends="calculate-solr-doc-condition" if="solr-doc.include">
@@ -1553,10 +1589,12 @@
</target>
<target name="deliver-memex-connector" depends="calculate-memex-condition" if="memex.include">
- <mkdir dir="dist/lib"/>
- <copy todir="dist/lib">
+ <mkdir dir="dist/connector-lib"/>
+ <copy todir="dist/connector-lib">
<fileset dir="connectors/memex/dist/lib"/>
</copy>
+ <replace file="dist/connectors.xml" token="<!-- Add your authority connectors here -->" value="<!-- Add your authority connectors here -->
 <authorityconnector name="Memex Patriarch" class="org.apache.manifoldcf.crawler.connectors.memex.MemexAuthority"/>"/>
+ <replace file="dist/connectors.xml" token="<!-- Add your repository connectors here -->" value="<!-- Add your repository connectors here -->
 <repositoryconnector name="Memex Patriarch" class="org.apache.manifoldcf.crawler.connectors.memex.MemexConnector"/>"/>
</target>
<target name="deliver-memex-connector-doc" depends="calculate-memex-doc-condition" if="memex-doc.include">
@@ -1581,8 +1619,8 @@
</target>
<target name="deliver-meridio-connector" depends="calculate-meridio-condition" if="meridio.include">
- <mkdir dir="dist/lib"/>
- <copy todir="dist/lib">
+ <mkdir dir="dist/connector-lib"/>
+ <copy todir="dist/connector-lib">
<fileset dir="connectors/meridio/dist/lib"/>
</copy>
<mkdir dir="dist/wsdd"/>
@@ -1593,6 +1631,10 @@
<copy todir="dist/meridio-integration">
<fileset dir="connectors/meridio/dist/integration"/>
</copy>
+ <replace file="dist/connectors.xml" token="<!-- Add your authority connectors here -->" value="<!-- Add your authority connectors here -->
 <authorityconnector name="Meridio" class="org.apache.manifoldcf.crawler.connectors.meridio.MeridioAuthority"/>"/>
+ <replace file="dist/connectors.xml" token="<!-- Add your repository connectors here -->" value="<!-- Add your repository connectors here -->
 <repositoryconnector name="Meridio" class="org.apache.manifoldcf.crawler.connectors.meridio.MeridioConnector"/>"/>
+ <replace file="dist/example/properties.xml" token="<!-- WSDD references -->" value="<!-- WSDD references -->
 <property name="org.apache.manifoldcf.meridio.wsddpath" value="../wsdd/meridio-client-config.wsdd"/>"/>
+ <replace file="dist/multi/properties.xml" token="<!-- WSDD references -->" value="<!-- WSDD references -->
 <property name="org.apache.manifoldcf.meridio.wsddpath" value="../wsdd/meridio-client-config.wsdd"/>"/>
</target>
<target name="deliver-meridio-connector-doc" depends="calculate-meridio-doc-condition" if="meridio-doc.include">
@@ -1617,10 +1659,11 @@
</target>
<target name="deliver-opensearchserver-connector" depends="calculate-opensearchserver-condition" if="opensearchserver.include">
- <mkdir dir="dist/lib"/>
- <copy todir="dist/lib">
+ <mkdir dir="dist/connector-lib"/>
+ <copy todir="dist/connector-lib">
<fileset dir="connectors/opensearchserver/dist/lib"/>
</copy>
+ <replace file="dist/connectors.xml" token="<!-- Add your output connectors here -->" value="<!-- Add your output connectors here -->
 <outputconnector name="OpenSearchServer" class="org.apache.manifoldcf.agents.output.opensearchserver.OpenSearchServerConnector"/>"/>
</target>
<target name="deliver-opensearchserver-connector-doc" depends="calculate-opensearchserver-doc-condition" if="opensearchserver-doc.include">
@@ -1645,10 +1688,11 @@
</target>
<target name="deliver-nullauthority-connector" depends="calculate-nullauthority-condition" if="nullauthority.include">
- <mkdir dir="dist/lib"/>
- <copy todir="dist/lib">
+ <mkdir dir="dist/connector-lib"/>
+ <copy todir="dist/connector-lib">
<fileset dir="connectors/nullauthority/dist/lib"/>
</copy>
+ <replace file="dist/connectors.xml" token="<!-- Add your authority connectors here -->" value="<!-- Add your authority connectors here -->
 <authorityconnector name="Null" class="org.apache.manifoldcf.authorities.authorities.nullauthority.NullAuthority"/>"/>
</target>
<target name="deliver-nullauthority-connector-doc" depends="calculate-nullauthority-doc-condition" if="nullauthority-doc.include">
@@ -1673,10 +1717,11 @@
</target>
<target name="deliver-nulloutput-connector" depends="calculate-nulloutput-condition" if="nulloutput.include">
- <mkdir dir="dist/lib"/>
- <copy todir="dist/lib">
+ <mkdir dir="dist/connector-lib"/>
+ <copy todir="dist/connector-lib">
<fileset dir="connectors/nulloutput/dist/lib"/>
</copy>
+ <replace file="dist/connectors.xml" token="<!-- Add your output connectors here -->" value="<!-- Add your output connectors here -->
 <outputconnector name="Null" class="org.apache.manifoldcf.agents.output.nullconnector.NullConnector"/>"/>
</target>
<target name="deliver-nulloutput-connector-doc" depends="calculate-nulloutput-doc-condition" if="nulloutput-doc.include">
@@ -1701,10 +1746,11 @@
</target>
<target name="deliver-rss-connector" depends="calculate-rss-condition" if="rss.include">
- <mkdir dir="dist/lib"/>
- <copy todir="dist/lib">
+ <mkdir dir="dist/connector-lib"/>
+ <copy todir="dist/connector-lib">
<fileset dir="connectors/rss/dist/lib"/>
</copy>
+ <replace file="dist/connectors.xml" token="<!-- Add your repository connectors here -->" value="<!-- Add your repository connectors here -->
 <repositoryconnector name="RSS" class="org.apache.manifoldcf.crawler.connectors.rss.RSSConnector"/>"/>
</target>
<target name="deliver-rss-connector-doc" depends="calculate-rss-doc-condition" if="rss-doc.include">
@@ -1729,8 +1775,8 @@
</target>
<target name="deliver-sharepoint-connector" depends="calculate-sharepoint-condition" if="sharepoint.include">
- <mkdir dir="dist/lib"/>
- <copy todir="dist/lib">
+ <mkdir dir="dist/connector-lib"/>
+ <copy todir="dist/connector-lib">
<fileset dir="connectors/sharepoint/dist/lib"/>
</copy>
<mkdir dir="dist/wsdd"/>
@@ -1741,6 +1787,9 @@
<copy todir="dist/sharepoint-integration">
<fileset dir="connectors/sharepoint/dist/integration"/>
</copy>
+ <replace file="dist/connectors.xml" token="<!-- Add your repository connectors here -->" value="<!-- Add your repository connectors here -->
 <repositoryconnector name="SharePoint" class="org.apache.manifoldcf.crawler.connectors.sharepoint.SharePointRepository"/>"/>
+ <replace file="dist/example/properties.xml" token="<!-- WSDD references -->" value="<!-- WSDD references -->
 <property name="org.apache.manifoldcf.sharepoint.wsddpath" value="../wsdd/sharepoint-client-config.wsdd"/>"/>
+ <replace file="dist/multi/properties.xml" token="<!-- WSDD references -->" value="<!-- WSDD references -->
 <property name="org.apache.manifoldcf.sharepoint.wsddpath" value="../wsdd/sharepoint-client-config.wsdd"/>"/>
</target>
<target name="deliver-sharepoint-connector-doc" depends="calculate-sharepoint-doc-condition" if="sharepoint-doc.include">
@@ -1765,10 +1814,11 @@
</target>
<target name="deliver-webcrawler-connector" depends="calculate-webcrawler-condition" if="webcrawler.include">
- <mkdir dir="dist/lib"/>
- <copy todir="dist/lib">
+ <mkdir dir="dist/connector-lib"/>
+ <copy todir="dist/connector-lib">
<fileset dir="connectors/webcrawler/dist/lib"/>
</copy>
+ <replace file="dist/connectors.xml" token="<!-- Add your repository connectors here -->" value="<!-- Add your repository connectors here -->
 <repositoryconnector name="Web" class="org.apache.manifoldcf.crawler.connectors.webcrawler.WebcrawlerConnector"/>"/>
</target>
<target name="deliver-webcrawler-connector-doc" depends="calculate-webcrawler-doc-condition" if="webcrawler-doc.include">
@@ -1793,10 +1843,11 @@
</target>
<target name="deliver-wiki-connector" depends="calculate-wiki-condition" if="wiki.include">
- <mkdir dir="dist/lib"/>
- <copy todir="dist/lib">
+ <mkdir dir="dist/connector-lib"/>
+ <copy todir="dist/connector-lib">
<fileset dir="connectors/wiki/dist/lib"/>
</copy>
+ <replace file="dist/connectors.xml" token="<!-- Add your repository connectors here -->" value="<!-- Add your repository connectors here -->
 <repositoryconnector name="Wiki" class="org.apache.manifoldcf.crawler.connectors.wiki.WikiConnector"/>"/>
</target>
<target name="deliver-wiki-connector-doc" depends="calculate-wiki-doc-condition" if="wiki-doc.include">
@@ -1806,234 +1857,6 @@
</copy>
</target>
-
- <target name="cleanup-example">
- <delete file="dist/example/connectors.xml"/>
- <delete file="dist/example/properties.xml"/>
- </target>
-
- <target name="deliver-framework-example" depends="cleanup-example,build-framework">
- <mkdir dir="dist/example"/>
- <copy todir="dist/example">
- <fileset dir="framework/dist/example"/>
- </copy>
- </target>
-
- <target name="deliver-activedirectory-example" depends="deliver-framework-example,calculate-activedirectory-condition" if="activedirectory.include">
- <mkdir dir="dist/example/connector-lib"/>
- <copy todir="dist/example/connector-lib">
- <fileset dir="connectors/activedirectory/dist/lib"/>
- </copy>
- <replace file="dist/example/connectors.xml" token="<!-- Add your authority connectors here -->" value="<!-- Add your authority connectors here -->
 <authorityconnector name="Active Directory" class="org.apache.manifoldcf.authorities.authorities.activedirectory.ActiveDirectoryAuthority"/>"/>
- </target>
-
- <target name="deliver-alfresco-example" depends="deliver-framework-example,calculate-alfresco-condition" if="alfresco.include">
- <mkdir dir="dist/example/connector-lib"/>
- <copy todir="dist/example/connector-lib">
- <fileset dir="connectors/alfresco/dist/lib"/>
- </copy>
- <replace file="dist/example/connectors.xml" token="<!-- Add your repository connectors here -->" value="<!-- Add your repository connectors here -->
 <repositoryconnector name="Alfresco" class="org.apache.manifoldcf.crawler.connectors.alfresco.AlfrescoRepositoryConnector"/>"/>
- </target>
-
- <target name="deliver-cmis-example" depends="deliver-framework-example,calculate-cmis-condition" if="cmis.include">
- <mkdir dir="dist/example/connector-lib"/>
- <copy todir="dist/example/connector-lib">
- <fileset dir="connectors/cmis/dist/lib"/>
- </copy>
- <replace file="dist/example/connectors.xml" token="<!-- Add your repository connectors here -->" value="<!-- Add your repository connectors here -->
 <repositoryconnector name="CMIS" class="org.apache.manifoldcf.crawler.connectors.cmis.CmisRepositoryConnector"/>"/>
- <replace file="dist/example/connectors.xml" token="<!-- Add your authority connectors here -->" value="<!-- Add your authority connectors here -->
 <authorityconnector name="CMIS" class="org.apache.manifoldcf.crawler.connectors.cmis.CmisAuthorityConnector"/>"/>
- </target>
-
- <target name="deliver-documentum-example" depends="deliver-framework-example,calculate-documentum-condition" if="documentum.include">
- <mkdir dir="dist/example/documentum-server-process"/>
- <copy todir="dist/example/documentum-server-process">
- <fileset dir="connectors/documentum/dist/server-process"/>
- </copy>
- <mkdir dir="dist/example/documentum-registry-process"/>
- <copy todir="dist/example/documentum-registry-process">
- <fileset dir="connectors/documentum/dist/registry-process"/>
- </copy>
- <mkdir dir="dist/example/connector-lib"/>
- <copy todir="dist/example/connector-lib">
- <fileset dir="connectors/documentum/dist/lib"/>
- </copy>
- <replace file="dist/example/connectors.xml" token="<!-- Add your authority connectors here -->" value="<!-- Add your authority connectors here -->
 <authorityconnector name="Documentum" class="org.apache.manifoldcf.crawler.authorities.DCTM.AuthorityConnector"/>"/>
- <replace file="dist/example/connectors.xml" token="<!-- Add your repository connectors here -->" value="<!-- Add your repository connectors here -->
 <repositoryconnector name="Documentum" class="org.apache.manifoldcf.crawler.connectors.DCTM.DCTM"/>"/>
- </target>
-
- <target name="deliver-filesystem-example" depends="deliver-framework-example,calculate-filesystem-condition" if="filesystem.include">
- <mkdir dir="dist/example/connector-lib"/>
- <copy todir="dist/example/connector-lib">
- <fileset dir="connectors/filesystem/dist/lib"/>
- </copy>
- <replace file="dist/example/connectors.xml" token="<!-- Add your repository connectors here -->" value="<!-- Add your repository connectors here -->
 <repositoryconnector name="File system" class="org.apache.manifoldcf.crawler.connectors.filesystem.FileConnector"/>"/>
- </target>
-
- <target name="deliver-filenet-example" depends="deliver-framework-example,calculate-filenet-condition" if="filenet.include">
- <mkdir dir="dist/example/filenet-server-process"/>
- <copy todir="dist/example/filenet-server-process">
- <fileset dir="connectors/filenet/dist/server-process"/>
- </copy>
- <mkdir dir="dist/example/filenet-registry-process"/>
- <copy todir="dist/example/filenet-registry-process">
- <fileset dir="connectors/filenet/dist/registry-process"/>
- </copy>
- <mkdir dir="dist/example/connector-lib"/>
- <copy todir="dist/example/connector-lib">
- <fileset dir="connectors/filenet/dist/lib"/>
- </copy>
- <replace file="dist/example/connectors.xml" token="<!-- Add your repository connectors here -->" value="<!-- Add your repository connectors here -->
 <repositoryconnector name="FileNet" class="org.apache.manifoldcf.crawler.connectors.filenet.FilenetConnector"/>"/>
- </target>
-
- <target name="deliver-gts-example" depends="deliver-framework-example,calculate-gts-condition" if="gts.include">
- <mkdir dir="dist/example/connector-lib"/>
- <copy todir="dist/example/connector-lib">
- <fileset dir="connectors/gts/dist/lib"/>
- </copy>
- <replace file="dist/example/connectors.xml" token="<!-- Add your output connectors here -->" value="<!-- Add your output connectors here -->
 <outputconnector name="MetaCarta GTS" class="org.apache.manifoldcf.agents.output.gts.GTSConnector"/>"/>
- </target>
-
- <target name="deliver-jcifs-example" depends="deliver-framework-example,calculate-jcifs-condition" if="jcifs.include">
- <mkdir dir="dist/example/connector-lib"/>
- <copy todir="dist/example/connector-lib">
- <fileset dir="connectors/jcifs/dist/lib"/>
- </copy>
- <replace file="dist/example/connectors.xml" token="<!-- Add your repository connectors here -->" value="<!-- Add your repository connectors here -->
 <repositoryconnector name="Windows shares" class="org.apache.manifoldcf.crawler.connectors.sharedrive.SharedDriveConnector"/>"/>
- </target>
-
- <target name="deliver-jdbc-example" depends="deliver-framework-example,calculate-jdbc-condition" if="jdbc.include">
- <mkdir dir="dist/example/connector-lib"/>
- <copy todir="dist/example/connector-lib">
- <fileset dir="connectors/jdbc/dist/lib"/>
- </copy>
- <replace file="dist/example/connectors.xml" token="<!-- Add your repository connectors here -->" value="<!-- Add your repository connectors here -->
 <repositoryconnector name="JDBC" class="org.apache.manifoldcf.crawler.connectors.jdbc.JDBCConnector"/>"/>
- </target>
-
- <target name="deliver-livelink-example" depends="deliver-framework-example,calculate-livelink-condition" if="livelink.include">
- <mkdir dir="dist/example/connector-lib"/>
- <copy todir="dist/example/connector-lib">
- <fileset dir="connectors/livelink/dist/lib"/>
- </copy>
- <replace file="dist/example/connectors.xml" token="<!-- Add your authority connectors here -->" value="<!-- Add your authority connectors here -->
 <authorityconnector name="LiveLink" class="org.apache.manifoldcf.crawler.connectors.livelink.LivelinkAuthority"/>"/>
- <replace file="dist/example/connectors.xml" token="<!-- Add your repository connectors here -->" value="<!-- Add your repository connectors here -->
 <repositoryconnector name="LiveLink" class="org.apache.manifoldcf.crawler.connectors.livelink.LivelinkConnector"/>"/>
- </target>
-
- <target name="deliver-memex-example" depends="deliver-framework-example,calculate-memex-condition" if="memex.include">
- <mkdir dir="dist/example/connector-lib"/>
- <copy todir="dist/example/connector-lib">
- <fileset dir="connectors/memex/dist/lib"/>
- </copy>
- <replace file="dist/example/connectors.xml" token="<!-- Add your authority connectors here -->" value="<!-- Add your authority connectors here -->
 <authorityconnector name="Memex Patriarch" class="org.apache.manifoldcf.crawler.connectors.memex.MemexAuthority"/>"/>
- <replace file="dist/example/connectors.xml" token="<!-- Add your repository connectors here -->" value="<!-- Add your repository connectors here -->
 <repositoryconnector name="Memex Patriarch" class="org.apache.manifoldcf.crawler.connectors.memex.MemexConnector"/>"/>
- </target>
-
- <target name="deliver-meridio-example" depends="deliver-framework-example,calculate-meridio-condition" if="meridio.include">
- <mkdir dir="dist/example/connector-lib"/>
- <copy todir="dist/example/connector-lib">
- <fileset dir="connectors/meridio/dist/lib"/>
- </copy>
- <mkdir dir="dist/example/wsdd"/>
- <copy todir="dist/example/wsdd">
- <fileset dir="connectors/meridio/dist/wsdd"/>
- </copy>
- <replace file="dist/example/connectors.xml" token="<!-- Add your authority connectors here -->" value="<!-- Add your authority connectors here -->
 <authorityconnector name="Meridio" class="org.apache.manifoldcf.crawler.connectors.meridio.MeridioAuthority"/>"/>
- <replace file="dist/example/connectors.xml" token="<!-- Add your repository connectors here -->" value="<!-- Add your repository connectors here -->
 <repositoryconnector name="Meridio" class="org.apache.manifoldcf.crawler.connectors.meridio.MeridioConnector"/>"/>
- <replace file="dist/example/properties.xml" token="<!-- WSDD references -->" value="<!-- WSDD references -->
 <property name="org.apache.manifoldcf.meridio.wsddpath" value="./wsdd/meridio-client-config.wsdd"/>"/>
- </target>
-
- <target name="deliver-nullauthority-example" depends="deliver-framework-example,calculate-nullauthority-condition" if="nullauthority.include">
- <mkdir dir="dist/example/connector-lib"/>
- <copy todir="dist/example/connector-lib">
- <fileset dir="connectors/nullauthority/dist/lib"/>
- </copy>
- <replace file="dist/example/connectors.xml" token="<!-- Add your authority connectors here -->" value="<!-- Add your authority connectors here -->
 <authorityconnector name="Null" class="org.apache.manifoldcf.authorities.authorities.nullauthority.NullAuthority"/>"/>
- </target>
-
- <target name="deliver-nulloutput-example" depends="deliver-framework-example,calculate-nulloutput-condition" if="nulloutput.include">
- <mkdir dir="dist/example/connector-lib"/>
- <copy todir="dist/example/connector-lib">
- <fileset dir="connectors/nulloutput/dist/lib"/>
- </copy>
- <replace file="dist/example/connectors.xml" token="<!-- Add your output connectors here -->" value="<!-- Add your output connectors here -->
 <outputconnector name="Null" class="org.apache.manifoldcf.agents.output.nullconnector.NullConnector"/>"/>
- </target>
-
- <target name="deliver-rss-example" depends="deliver-framework-example,calculate-rss-condition" if="rss.include">
- <mkdir dir="dist/example/connector-lib"/>
- <copy todir="dist/example/connector-lib">
- <fileset dir="connectors/rss/dist/lib"/>
- </copy>
- <replace file="dist/example/connectors.xml" token="<!-- Add your repository connectors here -->" value="<!-- Add your repository connectors here -->
 <repositoryconnector name="RSS" class="org.apache.manifoldcf.crawler.connectors.rss.RSSConnector"/>"/>
- </target>
-
- <target name="deliver-sharepoint-example" depends="deliver-framework-example,calculate-sharepoint-condition" if="sharepoint.include">
- <mkdir dir="dist/example/connector-lib"/>
- <copy todir="dist/example/connector-lib">
- <fileset dir="connectors/sharepoint/dist/lib"/>
- </copy>
- <mkdir dir="dist/example/wsdd"/>
- <copy todir="dist/example/wsdd">
- <fileset dir="connectors/sharepoint/dist/wsdd"/>
- </copy>
- <replace file="dist/example/connectors.xml" token="<!-- Add your repository connectors here -->" value="<!-- Add your repository connectors here -->
 <repositoryconnector name="SharePoint" class="org.apache.manifoldcf.crawler.connectors.sharepoint.SharePointRepository"/>"/>
- <replace file="dist/example/properties.xml" token="<!-- WSDD references -->" value="<!-- WSDD references -->
 <property name="org.apache.manifoldcf.sharepoint.wsddpath" value="./wsdd/sharepoint-client-config.wsdd"/>"/>
- </target>
-
- <target name="deliver-solr-example" depends="deliver-framework-example,calculate-solr-condition" if="solr.include">
- <mkdir dir="dist/example/connector-lib"/>
- <copy todir="dist/example/connector-lib">
- <fileset dir="connectors/solr/dist/lib"/>
- </copy>
- <replace file="dist/example/connectors.xml" token="<!-- Add your output connectors here -->" value="<!-- Add your output connectors here -->
 <outputconnector name="Solr" class="org.apache.manifoldcf.agents.output.solr.SolrConnector"/>"/>
- </target>
-
- <target name="deliver-opensearchserver-example" depends="deliver-framework-example,calculate-opensearchserver-condition" if="opensearchserver.include">
- <mkdir dir="dist/example/connector-lib"/>
- <copy todir="dist/example/connector-lib">
- <fileset dir="connectors/opensearchserver/dist/lib"/>
- </copy>
- <replace file="dist/example/connectors.xml" token="<!-- Add your output connectors here -->" value="<!-- Add your output connectors here -->
 <outputconnector name="OpenSearchServer" class="org.apache.manifoldcf.agents.output.opensearchserver.OpenSearchServerConnector"/>"/>
- </target>
-
- <target name="deliver-webcrawler-example" depends="deliver-framework-example,calculate-webcrawler-condition" if="webcrawler.include">
- <mkdir dir="dist/example/connector-lib"/>
- <copy todir="dist/example/connector-lib">
- <fileset dir="connectors/webcrawler/dist/lib"/>
- </copy>
- <replace file="dist/example/connectors.xml" token="<!-- Add your repository connectors here -->" value="<!-- Add your repository connectors here -->
 <repositoryconnector name="Web" class="org.apache.manifoldcf.crawler.connectors.webcrawler.WebcrawlerConnector"/>"/>
- </target>
-
- <target name="deliver-wiki-example" depends="deliver-framework-example,calculate-wiki-condition" if="wiki.include">
- <mkdir dir="dist/example/connector-lib"/>
- <copy todir="dist/example/connector-lib">
- <fileset dir="connectors/wiki/dist/lib"/>
- </copy>
- <replace file="dist/example/connectors.xml" token="<!-- Add your repository connectors here -->" value="<!-- Add your repository connectors here -->
 <repositoryconnector name="Wiki" class="org.apache.manifoldcf.crawler.connectors.wiki.WikiConnector"/>"/>
- </target>
-
- <target name="deliver-example" depends="deliver-framework-example,deliver-activedirectory-example,deliver-alfresco-example,deliver-cmis-example,deliver-documentum-example,deliver-filesystem-example,deliver-filenet-example,deliver-gts-example,deliver-jcifs-example,deliver-jdbc-example,deliver-livelink-example,deliver-memex-example,deliver-meridio-example,deliver-nullauthority-example,deliver-nulloutput-example,deliver-opensearchserver-example,deliver-rss-example,deliver-sharepoint-example,deliver-solr-example,deliver-webcrawler-example,deliver-wiki-example">
- <!-- 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. -->
- <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/commons-codec.jar lib/commons-collections.jar lib/commons-el.jar lib/commons-fileupload.jar lib/commons-httpclient-mcf.jar lib/commons-io.jar lib/commons-logging.jar lib/hsqldb.jar lib/derbyclient.jar lib/derby.jar lib/derbyLocale_cs.jar lib/derbyLocale_de_DE.jar lib/derbyLocale_es.jar lib/derbyLocale_fr.jar lib/derbyLocale_hu.jar lib/derbyLocale_it.jar lib/derbyLocale_ja_JP.jar lib/derbyLocale_ko_KR.jar lib/derbyLocale_pl.jar lib/derbyLocale_pt_BR.jar lib/derbyLocale_ru.jar lib/derbyLocale_zh_CN.jar lib/derbyLocale_zh_TW.jar lib/derbynet.jar lib/derbyrun.jar lib/derbytools.jar lib/eclipse-ecj.jar lib/jasper-6.0.24.jar lib/jasper-el-6.0.24.jar lib/jdbcpool-0.99.jar lib/jetty-6.1.26-patched-JETTY-1340.jar lib/jetty-util-6.1.26-patched-JETTY-1340.jar lib/jsp-api-2.1-glassfish-2.1.v20091210.jar lib/json.jar lib/mcf-agents.jar lib/mcf-core.jar lib/mcf-jetty-runner.jar lib/mcf-pull-agent.jar lib/mcf-ui-core.jar lib/log4j-1.2.jar
lib/postgresql.jar lib/serializer.jar lib/servlet-api-2.5-20081211.jar lib/tomcat-juli-6.0.24.jar lib/xalan2.jar lib/xercesImpl-mcf.jar lib/xml-apis.jar"/>
- </manifest>
- <jar destfile="dist/example/start.jar" manifest="build/example/manifest"/>
- </target>
-
- <target name="deliver-multi-process" depends="deliver-example">
- <copy todir="dist">
- <fileset dir="dist/example">
- <include name="properties.xml"/>
- <include name="connectors.xml"/>
- <include name="logging.ini"/>
- </fileset>
- </copy>
- <replace file="dist/properties.xml" token="<libdir path="./connector-lib"/>" value="<libdir path="./lib"/>"/>
- <mkdir dir="dist/mysynchdir"/>
- <replace file="dist/properties.xml" token="<!-- Any additional properties go here -->" value="<!-- Any additional properties go here -->
 <property name="org.apache.manifoldcf.synchdirectory" value="./mysynchdir"/>"/>
- </target>
-
<target name="calculate-filesystem-tests-condition" depends="calculate-filesystem-condition,calculate-nulloutput-condition">
<condition property="filesystem-tests.include">
<and>
@@ -3653,7 +3476,7 @@
<target name="deliver-proprietary-connectors" depends="deliver-documentum-connector,deliver-filenet-connector,deliver-livelink-connector,deliver-memex-connector,deliver-meridio-connector,deliver-sharepoint-connector"/>
<target name="deliver-proprietary-connectors-doc" depends="deliver-documentum-connector-doc,deliver-filenet-connector-doc,deliver-livelink-connector-doc,deliver-memex-connector-doc,deliver-meridio-connector-doc,deliver-sharepoint-connector-doc"/>
- <target name="build-dev" depends="deliver-framework,deliver-open-connectors,deliver-output-connectors,deliver-lgpl-connectors,deliver-proprietary-connectors,deliver-example,deliver-multi-process"/>
+ <target name="build-dev" depends="deliver-framework,deliver-open-connectors,deliver-output-connectors,deliver-lgpl-connectors,deliver-proprietary-connectors"/>
<target name="build" depends="build-dev,cleanup-afterbuild"/>
<target name="javadoc" depends="deliver-framework-doc,deliver-open-connectors-doc,deliver-output-connectors-doc,deliver-lgpl-connectors-doc,deliver-proprietary-connectors-doc"/>
<target name="doc" depends="deliver-site-doc"/>
Modified: incubator/lcf/branches/CONNECTORS-313/framework/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-313/framework/build.xml?rev=1214041&r1=1214040&r2=1214041&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-313/framework/build.xml (original)
+++ incubator/lcf/branches/CONNECTORS-313/framework/build.xml Wed Dec 14 03:32:50 2011
@@ -333,24 +333,39 @@
</copy>
</target>
+ <target name="example-common">
+ <copy todir="dist">
+ <fileset dir="example-common">
+ <include name="connectors.xml"/>
+ </fileset>
+ </copy>
+ </target>
+
<target name="war-authority-service" depends="webapp-authority-service">
- <mkdir dir="dist/web/war"/>
- <war destfile="dist/web/war/mcf-authority-service.war" webxml="authority-service/src/main/webapp/WEB-INF/web.xml" basedir="build/webapp/authority-service"/>
+ <mkdir dir="build/war"/>
+ <war destfile="build/war/mcf-authority-service.war" webxml="authority-service/src/main/webapp/WEB-INF/web.xml" basedir="build/webapp/authority-service"/>
</target>
<target name="war-api-service" depends="webapp-api-service">
- <mkdir dir="dist/web/war"/>
- <war destfile="dist/web/war/mcf-api-service.war" webxml="api-service/src/main/webapp/WEB-INF/web.xml" basedir="build/webapp/api-service"/>
+ <mkdir dir="build/war"/>
+ <war destfile="build/war/mcf-api-service.war" webxml="api-service/src/main/webapp/WEB-INF/web.xml" basedir="build/webapp/api-service"/>
</target>
<target name="war-crawler-ui" depends="webapp-crawler-ui">
- <mkdir dir="dist/web/war"/>
- <war destfile="dist/web/war/mcf-crawler-ui.war" webxml="crawler-ui/src/main/webapp/WEB-INF/web.xml" basedir="build/webapp/crawler-ui"/>
+ <mkdir dir="build/war"/>
+ <war destfile="build/war/mcf-crawler-ui.war" webxml="crawler-ui/src/main/webapp/WEB-INF/web.xml" basedir="build/webapp/crawler-ui"/>
</target>
- <target name="processes" depends="jar-core,jar-agents,jar-pull-agent">
- <mkdir dir="dist/processes/jar"/>
- <copy todir="dist/processes/jar">
+ <target name="multi-wars" depends="war-authority-service,war-api-service,war-crawler-ui">
+ <mkdir dir="dist/multi/web/war"/>
+ <copy todir="dist/multi/web/war">
+ <fileset dir="build/war"/>
+ </copy>
+ </target>
+
+ <target name="multi-processes" depends="jar-core,jar-agents,jar-pull-agent">
+ <mkdir dir="dist/multi/processes/jar"/>
+ <copy todir="dist/multi/processes/jar">
<fileset dir="lib">
<include name="commons-codec*.jar"/>
<include name="commons-collections*.jar"/>
@@ -373,20 +388,28 @@
<include name="derby*.jar"/>
<include name="hsqldb*.jar"/>
</fileset>
- </copy>
- <copy todir="dist/processes/jar">
<fileset dir="build/jar">
<include name="mcf-core.jar"/>
<include name="mcf-agents.jar"/>
<include name="mcf-pull-agent.jar"/>
</fileset>
</copy>
- <mkdir dir="dist/processes/script"/>
- <copy todir="dist/processes/script">
+ <mkdir dir="dist/multi/processes/script"/>
+ <copy todir="dist/multi/processes/script">
<fileset dir="scripts"/>
</copy>
</target>
+ <target name="multi-process-example" depends="multi-wars,multi-processes">
+ <copy todir="dist/multi">
+ <fileset dir="example-multiprocess">
+ <include name="properties.xml"/>
+ <include name="logging.ini"/>
+ </fileset>
+ </copy>
+ <mkdir dir="dist/multi/logs"/>
+ </target>
+
<target name="script-engine" depends="jar-script-engine,jar-core">
<mkdir dir="dist/script-engine/jar"/>
<copy todir="dist/script-engine/jar">
@@ -398,8 +421,6 @@
<include name="commons-logging*.jar"/>
<include name="json.jar"/>
</fileset>
- </copy>
- <copy todir="dist/script-engine/jar">
<fileset dir="build/jar">
<include name="mcf-core.jar"/>
<include name="mcf-script-engine.jar"/>
@@ -413,7 +434,7 @@
</copy>
</target>
- <target name="example" depends="war-crawler-ui,war-api-service,war-authority-service,jar-jetty-runner,jar-core,jar-agents,jar-pull-agent">
+ <target name="single-process-example" depends="war-crawler-ui,war-api-service,war-authority-service,jar-jetty-runner,jar-core,jar-agents,jar-pull-agent">
<mkdir dir="dist/example/lib"/>
<copy todir="dist/example/lib">
<fileset dir="lib">
@@ -444,8 +465,6 @@
<include name="derby*.jar"/>
<include name="hsqldb*.jar"/>
</fileset>
- </copy>
- <copy todir="dist/example/lib">
<fileset dir="build/jar">
<include name="mcf-core.jar"/>
<include name="mcf-ui-core.jar"/>
@@ -456,14 +475,13 @@
</copy>
<mkdir dir="dist/example/war"/>
<copy todir="dist/example/war">
- <fileset dir="dist/web/war"/>
+ <fileset dir="build/war"/>
</copy>
<mkdir dir="dist/example/connector-lib"/>
<mkdir dir="dist/example/logs"/>
<copy todir="dist/example">
- <fileset dir="jetty-example">
+ <fileset dir="example-singleprocess">
<include name="properties.xml"/>
- <include name="connectors.xml"/>
<include name="logging.ini"/>
</fileset>
</copy>
@@ -681,7 +699,7 @@
</java>
</target>
- <target name="build" depends="processes,war-authority-service,war-crawler-ui,war-api-service,example,script-engine"/>
+ <target name="build" depends="multi-process-example,single-process-example,example-common,script-engine"/>
<target name="all" depends="build,doc,build-tests,run-tests,run-tests-derby,run-tests-postgresql"/>
Copied: incubator/lcf/branches/CONNECTORS-313/framework/example-multiprocess/properties.xml (from r1214022, incubator/lcf/branches/CONNECTORS-313/framework/jetty-example/properties.xml)
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-313/framework/example-multiprocess/properties.xml?p2=incubator/lcf/branches/CONNECTORS-313/framework/example-multiprocess/properties.xml&p1=incubator/lcf/branches/CONNECTORS-313/framework/jetty-example/properties.xml&r1=1214022&r2=1214041&rev=1214041&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-313/framework/jetty-example/properties.xml (original)
+++ incubator/lcf/branches/CONNECTORS-313/framework/example-multiprocess/properties.xml Wed Dec 14 03:32:50 2011
@@ -17,17 +17,17 @@
-->
<configuration>
+ <!-- Point to the synchronization area -->
+ <property name="org.apache.manifoldcf.synchdirectory" value="./syncharea"/>
<!-- Select Derby as the database implementation, and specify where the database will be stored -->
<property name="org.apache.manifoldcf.databaseimplementationclass" value="org.apache.manifoldcf.core.database.DBInterfaceDerby"/>
<property name="org.apache.manifoldcf.derbydatabasepath" value="."/>
<property name="org.apache.manifoldcf.database.maxhandles" value="100"/>
<property name="org.apache.manifoldcf.crawler.threads" value="50"/>
- <!-- Point to a specific logging file -->
+ <!-- Point to a specific (common) logging file -->
<property name="org.apache.manifoldcf.logconfigfile" value="./logging.ini"/>
- <!-- Specify the connectors to be loaded -->
- <property name="org.apache.manifoldcf.connectorsconfigurationfile" value="./connectors.xml"/>
- <!-- Tell LCF where to find the connector jars -->
- <libdir path="./connector-lib"/>
+ <!-- Tell MCF where to find the connector jars -->
+ <libdir path="../connector-lib"/>
<!-- WSDD references -->
<!-- Any additional properties go here -->
</configuration>
Modified: incubator/lcf/branches/CONNECTORS-313/framework/example-singleprocess/properties.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-313/framework/example-singleprocess/properties.xml?rev=1214041&r1=1214022&r2=1214041&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-313/framework/example-singleprocess/properties.xml (original)
+++ incubator/lcf/branches/CONNECTORS-313/framework/example-singleprocess/properties.xml Wed Dec 14 03:32:50 2011
@@ -25,9 +25,9 @@
<!-- Point to a specific logging file -->
<property name="org.apache.manifoldcf.logconfigfile" value="./logging.ini"/>
<!-- Specify the connectors to be loaded -->
- <property name="org.apache.manifoldcf.connectorsconfigurationfile" value="./connectors.xml"/>
- <!-- Tell LCF where to find the connector jars -->
- <libdir path="./connector-lib"/>
+ <property name="org.apache.manifoldcf.connectorsconfigurationfile" value="../connectors.xml"/>
+ <!-- Tell MCF where to find the connector jars -->
+ <libdir path="../connector-lib"/>
<!-- WSDD references -->
<!-- Any additional properties go here -->
</configuration>