incubator-connectors-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1231882 - in /incubator/lcf/trunk/connectors: alfresco/build.xml connector-build.xml
Date Mon, 16 Jan 2012 09:34:54 GMT
Author: kwright
Date: Mon Jan 16 09:34:53 2012
New Revision: 1231882

URL: http://svn.apache.org/viewvc?rev=1231882&view=rev
Log:
Fix alfresco javadoc.  Part of CONNECTORS-384.

Modified:
    incubator/lcf/trunk/connectors/alfresco/build.xml
    incubator/lcf/trunk/connectors/connector-build.xml

Modified: incubator/lcf/trunk/connectors/alfresco/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/alfresco/build.xml?rev=1231882&r1=1231881&r2=1231882&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/alfresco/build.xml (original)
+++ incubator/lcf/trunk/connectors/alfresco/build.xml Mon Jan 16 09:34:53 2012
@@ -19,20 +19,15 @@
 
     <import file="../connector-build.xml"/>
 
-    <target name="clean">
-        <delete dir="build"/>
-        <delete dir="dist"/>
-        <delete dir="test-derby-output"/>
-    </target>
   
-      <target name="calculate-condition">
+    <target name="calculate-condition">
         <available file="alfresco-ws-client/alfresco-web-service-client-3.4.e.jar" property="alfrescoStatus"/>
         <condition property="canBuild">
             <isset property="alfrescoStatus"/>
         </condition>
     </target>
 
-      <target name="calculate-testcode-condition">
+    <target name="calculate-testcode-condition">
         <available file="alfresco-war/alfresco.war" property="alfrescoTestcodeStatus"/>
         <condition property="canTest">
             <isset property="alfrescoTestcodeStatus"/>
@@ -46,42 +41,15 @@
     <target name="pretest-check" depends="calculate-testcode-condition" unless="canTest">
         <echo message="Alfresco Connector tests cannot be be performed without alfresco.war"/>
     </target>
-    
-    <target name="doc" depends="precompile-check" if="canBuild">
-        <mkdir dir="dist/doc"/>
-        <javadoc destdir="dist/doc" source="1.5">
-            <classpath>
-                <fileset dir="lib" includes="*.jar"/>
-            </classpath>
-            <fileset dir="connector/src/main/java" includes="**/*.java"/>
-        </javadoc>
-    </target>
 
-    <target name="compile-connector" depends="precompile-check" if="canBuild">
-        <mkdir dir="build/connector/classes"/>
-        <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="alfresco-ws-client" includes="*.jar"/>
-            </classpath>
-        </javac>
-        <!-- native2ascii encoding="UTF-8" src="connector/src/main/native2ascii" dest="build/connector/classes"
includes="**/*.properties" / -->
-    </target>
-
-    <target name="jar-connector" depends="compile-connector,precompile-check" if="canBuild">
-        <mkdir dir="build/jar"/>
-        <jar destfile="build/jar/mcf-alfresco-connector.jar">
-        	<fileset dir="build/connector/classes"/>
-          <fileset dir="connector/src/main/resources"/>
-        </jar>
-    </target>
+    <path id="connector-classpath">
+        <path refid="mcf-connector-build.connector-classpath"/>
+        <fileset dir="alfresco-ws-client" includes="*.jar"/>
+    </path>
 
-    <target name="lib" depends="jar-connector,precompile-check" if="canBuild">
+    <target name="lib" depends="mcf-connector-build.lib,precompile-check" if="canBuild">
         <mkdir dir="dist/lib"/>
         <copy todir="dist/lib">
-            <fileset dir="build/jar">
-                <include name="mcf-alfresco-connector.jar"/>
-            </fileset>
             <fileset dir="alfresco-ws-client">
                 <include name="alfresco-web-service-client*.jar"/>
             </fileset>
@@ -100,24 +68,6 @@
         </copy>
     </target>
 
-    <target name="compile-tests" depends="compile-connector,precompile-check" if="canBuild">
-        <mkdir dir="build/connector-tests/classes"/>
-        <javac srcdir="connector/src/test/java" destdir="build/connector-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="build" depends="lib"/>
-    
-    <target name="build-tests" depends="lib,precompile-check" if="canBuild">
-        <mkdir dir="build/test-jar"/>
-    </target>
-    
     <target name="build-test-materials" depends="pretest-check" if="canTest">
         <mkdir dir="build/alfresco-war"/>
         <copy todir="build/alfresco-war">
@@ -127,8 +77,6 @@
         </copy>
     </target>
 
-    <target name="run-tests"/>
-    
     <target name="run-tests-derby" depends="compile-tests,precompile-check" if="canBuild">
         <mkdir dir="test-derby-output"/>
         <junit fork="true" maxmemory="128m" dir="test-derby-output" outputtoformatters="true"
showoutput="true" haltonfailure="true">
@@ -149,14 +97,6 @@
         </junit>
     </target>
     
-    <target name="run-tests-postgresql"/>
-    
-    <target name="run-tests-mysql"/>
-    
-    <target name="run-tests-HSQLDB"/>
-    
-    <target name="all" depends="build,doc,build-tests,run-tests,run-tests-derby,run-tests-HSQLDB"/>
-	
     <target name="download-alfresco-ws-client">
       <get src="http://maven.alfresco.com/nexus/service/local/repositories/releases/content/org/alfresco/alfresco-web-service-client/3.4.e/alfresco-web-service-client-3.4.e.jar"
dest="alfresco-ws-client"/>
     </target>

Modified: incubator/lcf/trunk/connectors/connector-build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/connector-build.xml?rev=1231882&r1=1231881&r2=1231882&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/connector-build.xml (original)
+++ incubator/lcf/trunk/connectors/connector-build.xml Mon Jan 16 09:34:53 2012
@@ -60,8 +60,14 @@
         <available file="build.xml" property="canBuild"/>
     </target>
 
+    <target name="calculate-testcode-condition" depends="calculate-condition" if="canBuild">
+        <available file="build.xml" property="canTest"/>
+    </target>
+
     <target name="precompile-check" depends="calculate-condition" unless="canBuild"/>
 
+    <target name="pretest-check" depends="calculate-testcode-condition" unless="canTest"/>
+
     <target name="has-native2ascii-check" depends="precompile-check" if="canBuild">
         <available file="connector/src/main/native2ascii" property="hasNative2Ascii"/>
     </target>
@@ -385,6 +391,8 @@
     
     <target name="build-tests" depends="build,jar-tests"/>
 
+    <target name="build-test-materials"/>
+
     <target name="run-tests"/>
     <target name="run-tests-derby"/>
     <target name="run-tests-postgresql"/>



Mime
View raw message