incubator-connectors-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1143843 - in /incubator/lcf/branches/CONNECTORS-221: build.xml connectors/cmis/build.xml
Date Thu, 07 Jul 2011 14:28:46 GMT
Author: kwright
Date: Thu Jul  7 14:28:46 2011
New Revision: 1143843

URL: http://svn.apache.org/viewvc?rev=1143843&view=rev
Log:
Update build.xml's to be compatible with standard practice.  Still missing the jar dependencies.

Modified:
    incubator/lcf/branches/CONNECTORS-221/build.xml
    incubator/lcf/branches/CONNECTORS-221/connectors/cmis/build.xml

Modified: incubator/lcf/branches/CONNECTORS-221/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-221/build.xml?rev=1143843&r1=1143842&r2=1143843&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-221/build.xml (original)
+++ incubator/lcf/branches/CONNECTORS-221/build.xml Thu Jul  7 14:28:46 2011
@@ -30,7 +30,8 @@
         <ant dir="site" target="clean"/>
         <ant dir="framework" target="clean"/>
         <delete dir="framework/lib"/>
-    	<ant dir="connectors/cmis" target="clean"/>
+        <ant dir="connectors/cmis" target="clean"/>
+        <delete dir="connectors/cmis/lib"/>
         <ant dir="connectors/activedirectory" target="clean"/>
         <delete dir="connectors/activedirectory/lib"/>
         <ant dir="connectors/documentum" target="clean"/>
@@ -164,25 +165,7 @@
     <target name="build-activedirectory-connector" depends="setup-activedirectory-connector">
         <ant dir="connectors/activedirectory" target="build"/>
     </target>
-	
-	<target name="setup-cmis-connector" depends="build-framework">
-        <mkdir dir="connectors/cmis/lib"/>
-        <copy todir="connectors/cmis/lib">
-            <fileset dir="framework/lib"/>
-        </copy>
-        <copy todir="connectors/cmis/lib">
-            <fileset dir="framework/build/jar"/>
-        </copy>
-    </target>
-	
-	<target name="build-cmis-connector" depends="setup-cmis-connector">
-		<ant dir="connectors/cmis" target="build"/>
-	</target>
-    
-	 <target name="doc-cmis-connector" depends="setup-cmis-connector">
-     	<ant dir="connectors/cmis" target="doc"/>
-	</target>
-	
+
     <target name="doc-activedirectory-connector" depends="setup-activedirectory-connector">
       <ant dir="connectors/activedirectory" target="doc"/>
     </target>
@@ -203,6 +186,47 @@
         <ant dir="connectors/activedirectory" target="run-tests-HSQLDB"/>
     </target>
 
+    <target name="setup-cmis-connector" depends="build-framework">
+        <mkdir dir="connectors/cmis/lib"/>
+        <copy todir="connectors/cmis/lib">
+            <fileset dir="framework/lib"/>
+        </copy>
+        <copy todir="connectors/cmis/lib">
+            <fileset dir="framework/build/jar"/>
+        </copy>
+    </target>
+
+    <target name="setup-cmis-connector-tests" depends="build-tests-framework">
+        <mkdir dir="connectors/cmis/lib"/>
+        <copy todir="connectors/cmis/lib">
+            <fileset dir="framework/build/test-jar"/>
+        </copy>
+    </target>
+
+    <target name="build-cmis-connector" depends="setup-cmis-connector">
+        <ant dir="connectors/cmis" target="build"/>
+    </target>
+    
+    <target name="doc-cmis-connector" depends="setup-cmis-connector">
+        <ant dir="connectors/cmis" target="doc"/>
+    </target>
+
+    <target name="build-tests-cmis-connector" depends="setup-cmis-connector,setup-cmis-connector-tests">
+        <ant dir="connectors/cmis" target="build-tests"/>
+    </target>
+
+    <target name="run-tests-cmis-connector" depends="setup-cmis-connector,setup-cmis-connector-tests">
+        <ant dir="connectors/cmis" target="run-tests"/>
+    </target>
+
+    <target name="run-tests-postgresql-cmis-connector" depends="setup-cmis-connector,setup-cmis-connector-tests">
+        <ant dir="connectors/cmis" target="run-tests-postgresql"/>
+    </target>
+
+    <target name="run-tests-HSQLDB-cmis-connector" depends="setup-cmis-connector,setup-cmis-connector-tests">
+        <ant dir="connectors/cmis" target="run-tests-HSQLDB"/>
+    </target>
+
     <target name="setup-documentum-connector" depends="build-framework">
         <mkdir dir="connectors/documentum/lib"/>
         <copy todir="connectors/documentum/lib">
@@ -884,36 +908,39 @@
             <fileset dir="connectors/activedirectory/dist/lib"/>
         </copy>
     </target>
-	
-	<target name="calculate-cmis-condition" depends="build-cmis-connector">
-		<available file="connectors/cmis/dist/lib" type="dir" property="cmis.exists"/>
-	    <condition property="cmis.include">
-	    	<isset property="cmis.exists"/>
-		</condition>
-	</target>
-	
-	<target name="deliver-cmis-connector" depends="calculate-cmis-condition" if="cmis.include">
-        <mkdir dir="dist/lib"/>
-        <copy todir="dist/lib">
-            <fileset dir="connectors/cmis/dist/lib"/>
+
+    <target name="deliver-activedirectory-connector-doc" depends="calculate-activedirectory-doc-condition"
if="activedirectory-doc.include">
+        <mkdir dir="dist/doc/api/activedirectory"/>
+        <copy todir="dist/doc/api/activedirectory">
+	  <fileset dir="connectors/activedirectory/dist/doc"/>
         </copy>
     </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">
+
+    <target name="calculate-cmis-condition" depends="build-cmis-connector">
+        <available file="connectors/cmis/dist/lib" type="dir" property="cmis.exists"/>
+        <condition property="cmis.include">
+            <isset property="cmis.exists"/>
+        </condition>
+    </target>
+
+    <target name="calculate-cmis-doc-condition" depends="doc-cmis-connector">
+        <available file="connectors/cmis/dist/doc" type="dir" property="cmis-doc.exists"/>
+        <condition property="cmis-doc.include">
+            <isset property="cmis-doc.exists"/>
+        </condition>
+    </target>
+
+    <target name="deliver-cmis-connector" depends="calculate-cmis-condition" if="cmis.include">
+        <mkdir dir="dist/lib"/>
+        <copy todir="dist/lib">
             <fileset dir="connectors/cmis/dist/lib"/>
         </copy>
-		<copy todir="dist/example/connector-lib">
-            <fileset dir="connectors/cmis/lib"/>
-        </copy>
-        <replace file="dist/example/connectors.xml" token="&lt;!-- Add your repository
connectors here --&gt;" value="&lt;!-- Add your authority connectors here --&gt;&#0010;
 &lt;repositoryconnector name=&quot;CMIS&quot; class=&quot;org.apache.manifoldcf.crawler.connectors.cmis.CmisRepositoryConnector&quot;/&gt;"/>
     </target>
-    
-    <target name="deliver-activedirectory-connector-doc" depends="calculate-activedirectory-doc-condition"
if="activedirectory-doc.include">
-        <mkdir dir="dist/doc/api/activedirectory"/>
-        <copy todir="dist/doc/api/activedirectory">
-	  <fileset dir="connectors/activedirectory/dist/doc"/>
+
+    <target name="deliver-cmis-connector-doc" depends="calculate-cmis-doc-condition" if="cmis-doc.include">
+        <mkdir dir="dist/doc/api/cmis"/>
+        <copy todir="dist/doc/api/cmis">
+	  <fileset dir="connectors/cmis/dist/doc"/>
         </copy>
     </target>
 
@@ -1381,6 +1408,14 @@
         <replace file="dist/example/connectors.xml" token="&lt;!-- Add your authority
connectors here --&gt;" value="&lt;!-- Add your authority connectors here --&gt;&#0010;
 &lt;authorityconnector name=&quot;Active Directory&quot; class=&quot;org.apache.manifoldcf.authorities.authorities.activedirectory.ActiveDirectoryAuthority&quot;/&gt;"/>
     </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="&lt;!-- Add your repository
connectors here --&gt;" value="&lt;!-- Add your repository connectors here --&gt;&#0010;
 &lt;repositoryconnector name=&quot;CMIS&quot; class=&quot;org.apache.manifoldcf.crawler.connectors.cmis.CmisRepositoryConnector&quot;/&gt;"/>
+    </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">
@@ -1531,7 +1566,7 @@
         <replace file="dist/example/connectors.xml" token="&lt;!-- Add your repository
connectors here --&gt;" value="&lt;!-- Add your repository connectors here --&gt;&#0010;
 &lt;repositoryconnector name=&quot;Web&quot; class=&quot;org.apache.manifoldcf.crawler.connectors.webcrawler.WebcrawlerConnector&quot;/&gt;"/>
     </target>
 
-    <target name="deliver-example" depends="deliver-framework-example,deliver-cmis-example,deliver-activedirectory-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-rss-example,deliver-sharepoint-example,deliver-solr-example,deliver-webcrawler-example">
+    <target name="deliver-example" depends="deliver-framework-example,deliver-activedirectory-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-rss-example,deliver-sharepoint-example,deliver-solr-example,deliver-webcrawler-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"/>
@@ -1819,26 +1854,26 @@
         </junit>
     </target>
 
-    <target name="run-tests-open-connectors" depends="run-tests-activedirectory-connector,run-tests-filesystem-connector,run-tests-nullauthority-connector,run-tests-nulloutput-connector,run-tests-rss-connector,run-tests-solr-connector,run-tests-webcrawler-connector,run-tests-jdbc-connector"/>
+    <target name="run-tests-open-connectors" depends="run-tests-activedirectory-connector,run-tests-cmis-connector,run-tests-filesystem-connector,run-tests-nullauthority-connector,run-tests-nulloutput-connector,run-tests-rss-connector,run-tests-solr-connector,run-tests-webcrawler-connector,run-tests-jdbc-connector"/>
     <target name="run-tests-lgpl-connectors" depends="run-tests-jcifs-connector"/>
     <target name="run-tests-proprietary-connectors" depends="run-tests-documentum-connector,run-tests-filenet-connector,run-tests-livelink-connector,run-tests-memex-connector,run-tests-meridio-connector,run-tests-sharepoint-connector"/>
     
     <target name="end-to-end-tests" depends="run-filesystem-tests,run-sharepoint-tests"/>
 
-    <target name="run-tests-postgresql-open-connectors" depends="run-tests-postgresql-activedirectory-connector,run-tests-postgresql-filesystem-connector,run-tests-postgresql-nullauthority-connector,run-tests-postgresql-nulloutput-connector,run-tests-postgresql-rss-connector,run-tests-postgresql-solr-connector,run-tests-postgresql-webcrawler-connector,run-tests-postgresql-jdbc-connector"/>
+    <target name="run-tests-postgresql-open-connectors" depends="run-tests-postgresql-activedirectory-connector,run-tests-postgresql-cmis-connector,run-tests-postgresql-filesystem-connector,run-tests-postgresql-nullauthority-connector,run-tests-postgresql-nulloutput-connector,run-tests-postgresql-rss-connector,run-tests-postgresql-solr-connector,run-tests-postgresql-webcrawler-connector,run-tests-postgresql-jdbc-connector"/>
     <target name="run-tests-postgresql-lgpl-connectors" depends="run-tests-postgresql-jcifs-connector"/>
     <target name="run-tests-postgresql-proprietary-connectors" depends="run-tests-postgresql-documentum-connector,run-tests-postgresql-filenet-connector,run-tests-postgresql-livelink-connector,run-tests-postgresql-memex-connector,run-tests-postgresql-meridio-connector,run-tests-postgresql-sharepoint-connector"/>
     
     <target name="end-to-end-tests-postgresql" depends="run-filesystem-tests-postgresql,run-sharepoint-tests-postgresql"/>
 
-    <target name="run-tests-HSQLDB-open-connectors" depends="run-tests-HSQLDB-activedirectory-connector,run-tests-HSQLDB-filesystem-connector,run-tests-HSQLDB-nullauthority-connector,run-tests-HSQLDB-nulloutput-connector,run-tests-HSQLDB-rss-connector,run-tests-HSQLDB-solr-connector,run-tests-HSQLDB-webcrawler-connector,run-tests-HSQLDB-jdbc-connector"/>
+    <target name="run-tests-HSQLDB-open-connectors" depends="run-tests-HSQLDB-activedirectory-connector,run-tests-HSQLDB-cmis-connector,run-tests-HSQLDB-filesystem-connector,run-tests-HSQLDB-nullauthority-connector,run-tests-HSQLDB-nulloutput-connector,run-tests-HSQLDB-rss-connector,run-tests-HSQLDB-solr-connector,run-tests-HSQLDB-webcrawler-connector,run-tests-HSQLDB-jdbc-connector"/>
     <target name="run-tests-HSQLDB-lgpl-connectors" depends="run-tests-HSQLDB-jcifs-connector"/>
     <target name="run-tests-HSQLDB-proprietary-connectors" depends="run-tests-HSQLDB-documentum-connector,run-tests-HSQLDB-filenet-connector,run-tests-HSQLDB-livelink-connector,run-tests-HSQLDB-memex-connector,run-tests-HSQLDB-meridio-connector,run-tests-HSQLDB-sharepoint-connector"/>
     
     <target name="end-to-end-tests-HSQLDB" depends="run-filesystem-tests-HSQLDB,run-sharepoint-tests-HSQLDB"/>
 
-    <target name="deliver-open-connectors" depends="deliver-nullauthority-connector,deliver-activedirectory-connector,deliver-filesystem-connector,deliver-rss-connector,deliver-webcrawler-connector,deliver-jdbc-connector"/>
-    <target name="deliver-open-connectors-doc" depends="deliver-nullauthority-connector-doc,deliver-activedirectory-connector-doc,deliver-filesystem-connector-doc,deliver-rss-connector-doc,deliver-webcrawler-connector-doc,deliver-jdbc-connector-doc"/>
+    <target name="deliver-open-connectors" depends="deliver-nullauthority-connector,deliver-activedirectory-connector,deliver-cmis-connector,deliver-filesystem-connector,deliver-rss-connector,deliver-webcrawler-connector,deliver-jdbc-connector"/>
+    <target name="deliver-open-connectors-doc" depends="deliver-nullauthority-connector-doc,deliver-activedirectory-connector-doc,deliver-cmis-connector-doc,deliver-filesystem-connector-doc,deliver-rss-connector-doc,deliver-webcrawler-connector-doc,deliver-jdbc-connector-doc"/>
     
     <target name="deliver-output-connectors" depends="deliver-gts-connector,deliver-solr-connector,deliver-nulloutput-connector"/>
     <target name="deliver-output-connectors-doc" depends="deliver-gts-connector-doc,deliver-solr-connector-doc,deliver-nulloutput-connector-doc"/>
@@ -1850,7 +1885,7 @@
     <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" depends="deliver-framework,deliver-open-connectors,deliver-output-connectors,deliver-lgpl-connectors,deliver-proprietary-connectors,deliver-example,deliver-cmis-connector"/>
+    <target name="build" depends="deliver-framework,deliver-open-connectors,deliver-output-connectors,deliver-lgpl-connectors,deliver-proprietary-connectors,deliver-example"/>
     <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-221/connectors/cmis/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-221/connectors/cmis/build.xml?rev=1143843&r1=1143842&r2=1143843&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-221/connectors/cmis/build.xml (original)
+++ incubator/lcf/branches/CONNECTORS-221/connectors/cmis/build.xml Thu Jul  7 14:28:46 2011
@@ -37,8 +37,6 @@
         <javac srcdir="connector/src/main/java" destdir="build/connector/classes" target="1.5"
source="1.5" debug="true" debuglevel="lines,vars,source">
             <classpath>
                 <fileset dir="lib" includes="*.jar"/>
-            	<fileset dir="../../dist/processes/jar" includes="*.jar"/>
-            	<fileset dir="../../dist/example/lib" includes="*.jar"/>
             </classpath>
         </javac>
     </target>
@@ -53,42 +51,13 @@
         <copy todir="dist/lib" file="build/jar/mcf-cmis-connector.jar"/>
     </target>
 
-    <target name="compile-tests" depends="compile-connector">
-        <mkdir dir="build/tests/classes"/>
-        <javac srcdir="tests/src/main/java" destdir="build/tests/classes" target="1.5"
source="1.5" debug="true" debuglevel="lines,vars,source">
-            <classpath>
-                 <fileset dir="lib"> 
-                    <include name="*.jar"/> 
-                </fileset>
-                <pathelement location="build/connector/classes"/>
-            </classpath>
-        </javac>
-    </target>
-    
-    <target name="jar-tests" depends="compile-tests">
-        <mkdir dir="build/test-jar"/>
-        <jar destfile="build/test-jar/mcf-cmis-connector-tests.jar" basedir="build/tests/classes"/>
-    </target>
-
-    <target name="run-tests" depends="compile-tests">
-        <mkdir dir="test-output"/>
-        <junit fork="true" maxmemory="128m" dir="test-output" showoutput="true" haltonfailure="true">
-            <classpath>
-                <fileset dir="lib">
-                    <include name="*.jar"/>
-                </fileset>
-                <pathelement location="build/connector/classes"/>
-                <pathelement location="build/tests/classes"/>
-            </classpath>
-            <!--
-        	<test name="org.apache.manifoldcf.crawler.connectors.filesystem.tests.Sanity"
todir="test-output"/>
-        	-->
-            <!-- MHL -->
-        </junit>
-    </target>
-
     <target name="build" depends="lib"/>
-    <target name="build-tests" depends="jar-tests"/>
-    <target name="all" depends="build,doc,build-tests,run-tests"/>
+    <target name="build-tests">
+      <mkdir dir="build/test-jar"/>
+    </target>
+    <target name="run-tests"/>
+    <target name="run-tests-postgresql"/>
+    <target name="run-tests-HSQLDB"/>
+    <target name="all" depends="build,doc,build-tests,run-tests,run-tests-postgresql,run-tests-HSQLDB"/>
     
 </project>



Mime
View raw message