incubator-connectors-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1226141 [1/5] - in /incubator/lcf/trunk: ./ connectors/alfresco/ connectors/alfresco/alfresco-ws-client/ connectors/cmis/ connectors/documentum/dfc/ connectors/filenet/filenet-api/ connectors/filesystem/ connectors/jcifs/jcifs/ connectors/...
Date Sat, 31 Dec 2011 17:23:37 GMT
Author: kwright
Date: Sat Dec 31 17:23:35 2011
New Revision: 1226141

URL: http://svn.apache.org/viewvc?rev=1226141&view=rev
Log:
Fix for CONNECTORS-346.

Added:
    incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/APISanityTester.java   (with props)
    incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/BigCrawlTester.java   (with props)
    incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/ExpirationTester.java   (with props)
    incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/FileHelper.java   (with props)
    incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/HopcountTester.java   (with props)
    incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/NavigationDerbyUI.java
      - copied, changed from r1225824, incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/NavigationUI.java
    incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/SanityTester.java   (with props)
    incubator/lcf/trunk/tests/rss/src/test/java/org/apache/manifoldcf/rss_tests/BigCrawlTester.java   (with props)
Removed:
    incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/NavigationUI.java
Modified:
    incubator/lcf/trunk/   (props changed)
    incubator/lcf/trunk/CHANGES.txt
    incubator/lcf/trunk/build.xml
    incubator/lcf/trunk/connectors/alfresco/   (props changed)
    incubator/lcf/trunk/connectors/alfresco/alfresco-ws-client/   (props changed)
    incubator/lcf/trunk/connectors/alfresco/build.xml
    incubator/lcf/trunk/connectors/cmis/   (props changed)
    incubator/lcf/trunk/connectors/cmis/build.xml
    incubator/lcf/trunk/connectors/documentum/dfc/   (props changed)
    incubator/lcf/trunk/connectors/filenet/filenet-api/   (props changed)
    incubator/lcf/trunk/connectors/filesystem/   (props changed)
    incubator/lcf/trunk/connectors/filesystem/build.xml
    incubator/lcf/trunk/connectors/jcifs/jcifs/   (props changed)
    incubator/lcf/trunk/connectors/jdbc/jdbc-drivers/   (props changed)
    incubator/lcf/trunk/connectors/livelink/lapi/   (props changed)
    incubator/lcf/trunk/connectors/rss/   (props changed)
    incubator/lcf/trunk/connectors/rss/build.xml
    incubator/lcf/trunk/connectors/sharepoint/wsdls/   (props changed)
    incubator/lcf/trunk/connectors/webcrawler/build.xml
    incubator/lcf/trunk/connectors/wiki/   (props changed)
    incubator/lcf/trunk/connectors/wiki/build.xml
    incubator/lcf/trunk/framework/   (props changed)
    incubator/lcf/trunk/framework/build.xml
    incubator/lcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/BaseITDerby.java
    incubator/lcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/BaseITHSQLDB.java
    incubator/lcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/BaseITMySQL.java
    incubator/lcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/BaseITPostgresql.java
    incubator/lcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/ManifoldCFInstance.java
    incubator/lcf/trunk/lib/   (props changed)
    incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/APISanityHSQLDBIT.java
    incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/APISanityIT.java
    incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/APISanityMySQLIT.java
    incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/APISanityPostgresqlIT.java
    incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/BaseDerby.java
    incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/BaseHSQLDB.java
    incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/BaseMySQL.java
    incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/BasePostgresql.java
    incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/BigCrawlDerbyLT.java
    incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/BigCrawlHSQLDBLT.java
    incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/BigCrawlMySQLLT.java
    incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/BigCrawlPostgresqlLT.java
    incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/ExpirationHSQLDBIT.java
    incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/ExpirationIT.java
    incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/ExpirationMySQLIT.java
    incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/ExpirationPostgresqlIT.java
    incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/HopcountHSQLDBIT.java
    incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/HopcountIT.java
    incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/HopcountMySQLIT.java
    incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/HopcountPostgresqlIT.java
    incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/SanityHSQLDBIT.java
    incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/SanityIT.java
    incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/SanityMySQLIT.java
    incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/SanityPostgresqlIT.java
    incubator/lcf/trunk/tests/rss/src/test/java/org/apache/manifoldcf/rss_tests/BigCrawlDerbyLT.java
    incubator/lcf/trunk/tests/rss/src/test/java/org/apache/manifoldcf/rss_tests/BigCrawlHSQLDBLT.java
    incubator/lcf/trunk/tests/rss/src/test/java/org/apache/manifoldcf/rss_tests/BigCrawlMySQLLT.java
    incubator/lcf/trunk/tests/rss/src/test/java/org/apache/manifoldcf/rss_tests/BigCrawlPostgresqlLT.java
    incubator/lcf/trunk/tests/wiki/src/test/java/org/apache/manifoldcf/wiki_tests/SanityDerbyIT.java

Propchange: incubator/lcf/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Dec 31 17:23:35 2011
@@ -12,9 +12,11 @@ bin
 build
 dist
 target
-test-output
+test-derby-output
 test-postgresql-output
 test-HSQLDB-output
+test-HSQLDBext-output
+test-mysql-output
 apache-manifoldcf-0.1-incubator.zip
 apache-manifoldcf-0.1-incubator.tar.gz
 apache-manifoldcf-SNAPSHOT.zip

Modified: incubator/lcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/CHANGES.txt?rev=1226141&r1=1226140&r2=1226141&view=diff
==============================================================================
--- incubator/lcf/trunk/CHANGES.txt (original)
+++ incubator/lcf/trunk/CHANGES.txt Sat Dec 31 17:23:35 2011
@@ -3,13 +3,17 @@ $Id$
 
 ======================= 0.5-dev =====================
 
+CONNECTORS-346: Reorganize test class hierarchy, and main ant
+build targets, to reduce duplication of code and make more sense.
+(Karl Wright)
+
 CONNECTORS-328: added explicit support for Multi-Tenancy in the job configuration
 (Piergiorgio Lucidi)
 
 CONNECTORS-349: content binary is not correctly read
 (Piergiorgio Lucidi)
 
-CONNECTORS-337: Pay attention to -DskipIT for alfresco, cmis, and
+CONNECTORS-337: Pay attention to -DskipITs for alfresco, cmis, and
 wiki tests on Maven build.
 (Karl Wright)
 

Modified: incubator/lcf/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/build.xml?rev=1226141&r1=1226140&r2=1226141&view=diff
==============================================================================
--- incubator/lcf/trunk/build.xml (original)
+++ incubator/lcf/trunk/build.xml Sat Dec 31 17:23:35 2011
@@ -24,7 +24,8 @@
         </delete>
         <delete dir="build"/>
         <delete dir="dist"/>
-        <delete dir="test-output"/>
+        <delete dir="test-output/"/>
+        <delete dir="test-derby-output"/>
         <delete dir="test-postgresql-output"/>
         <delete dir="test-mysql-output"/>
         <delete dir="test-HSQLDB-output"/>
@@ -76,8 +77,14 @@
 
     <target name="cleanup-afterbuild">
         <delete dir="build"/>
-        <delete dir="framework/build"/>
-        <delete dir="framework/dist"/>
+        <delete dir="test-output/"/>
+        <delete dir="test-derby-output"/>
+        <delete dir="test-postgresql-output"/>
+        <delete dir="test-mysql-output"/>
+        <delete dir="test-HSQLDB-output"/>
+        <delete dir="test-HSQLDBext-output"/>
+        <ant dir="site" target="clean"/>
+        <ant dir="framework" target="clean"/>
         <delete dir="framework/lib"/>
         <ant dir="connectors/alfresco" target="clean"/>
         <delete dir="connectors/alfresco/lib"/>
@@ -2206,8 +2213,8 @@
     </target>
     
     <target name="run-filesystem-tests-derby" depends="compile-filesystem-tests,calculate-filesystem-tests-condition" if="filesystem-tests.include">
-        <mkdir dir="test-output/filesystem"/>
-        <junit fork="true" maxmemory="128m" dir="test-output/filesystem" outputtoformatters="true" showoutput="true" haltonfailure="true">
+        <mkdir dir="test-derby-output/filesystem"/>
+        <junit fork="true" maxmemory="128m" dir="test-derby-output/filesystem" outputtoformatters="true" showoutput="true" haltonfailure="true">
             <classpath>
                 <fileset dir="framework/lib">
                     <include name="*.jar"/>
@@ -2240,17 +2247,17 @@
             </classpath>
             <formatter type="brief" usefile="false"/>
 
-            <test name="org.apache.manifoldcf.filesystem_tests.SanityIT" todir="test-output/filesystem"/>
-            <test name="org.apache.manifoldcf.filesystem_tests.APISanityIT" todir="test-output/filesystem"/>
-            <test name="org.apache.manifoldcf.filesystem_tests.HopcountIT" todir="test-output/filesystem"/>
-            <test name="org.apache.manifoldcf.filesystem_tests.ExpirationIT" todir="test-output/filesystem"/>
+            <test name="org.apache.manifoldcf.filesystem_tests.SanityIT" todir="test-derby-output/filesystem"/>
+            <test name="org.apache.manifoldcf.filesystem_tests.APISanityIT" todir="test-derby-output/filesystem"/>
+            <test name="org.apache.manifoldcf.filesystem_tests.HopcountIT" todir="test-derby-output/filesystem"/>
+            <test name="org.apache.manifoldcf.filesystem_tests.ExpirationIT" todir="test-derby-output/filesystem"/>
             <!-- MHL -->
         </junit>
     </target>
 
     <target name="run-filesystem-UI-tests-derby" depends="compile-filesystem-tests,calculate-filesystem-tests-condition" if="filesystem-tests.include">
-        <mkdir dir="test-output/filesystem"/>
-        <junit fork="true" maxmemory="128m" dir="test-output/filesystem" outputtoformatters="true" showoutput="true" haltonfailure="true">
+        <mkdir dir="test-derby-output/filesystem"/>
+        <junit fork="true" maxmemory="128m" dir="test-derby-output/filesystem" outputtoformatters="true" showoutput="true" haltonfailure="true">
             <classpath>
                 <fileset dir="framework/lib">
                     <include name="*.jar"/>
@@ -2283,14 +2290,14 @@
             </classpath>
             <formatter type="brief" usefile="false"/>
 
-            <test name="org.apache.manifoldcf.filesystem_tests.NavigationUI" todir="test-output/filesystem"/>
+            <test name="org.apache.manifoldcf.filesystem_tests.NavigationDerbyUI" todir="test-derby-output/filesystem"/>
             <!-- MHL -->
         </junit>
     </target>
 
     <target name="run-filesystem-loadtests-derby" depends="compile-filesystem-tests,calculate-filesystem-tests-condition" if="filesystem-tests.include">
-        <mkdir dir="test-output/filesystem"/>
-        <junit fork="true" maxmemory="256m" dir="test-output/filesystem" outputtoformatters="true" showoutput="true" haltonfailure="true">
+        <mkdir dir="test-derby-output/filesystem"/>
+        <junit fork="true" maxmemory="256m" dir="test-derby-output/filesystem" outputtoformatters="true" showoutput="true" haltonfailure="true">
             <classpath>
                 <fileset dir="framework/lib">
                     <include name="*.jar"/>
@@ -2317,14 +2324,14 @@
             </classpath>
             <formatter type="brief" usefile="false"/>
 	    
-            <test name="org.apache.manifoldcf.filesystem_tests.BigCrawlDerbyLT" todir="test-output/filesystem"/>
+            <test name="org.apache.manifoldcf.filesystem_tests.BigCrawlDerbyLT" todir="test-derby-output/filesystem"/>
 	    
         </junit>
     </target>
 
     <target name="run-rss-loadtests-derby" depends="compile-rss-tests,calculate-rss-tests-condition" if="rss-tests.include">
-        <mkdir dir="test-output/rss"/>
-        <junit fork="true" maxmemory="384m" dir="test-output/rss" outputtoformatters="true" showoutput="true" haltonfailure="true">
+        <mkdir dir="test-derby-output/rss"/>
+        <junit fork="true" maxmemory="384m" dir="test-derby-output/rss" outputtoformatters="true" showoutput="true" haltonfailure="true">
             <classpath>
                 <fileset dir="framework/lib">
                     <include name="*.jar"/>
@@ -2351,7 +2358,7 @@
             </classpath>
             <formatter type="brief" usefile="false"/>
 
-            <test name="org.apache.manifoldcf.rss_tests.BigCrawlDerbyLT" todir="test-output/rss"/>
+            <test name="org.apache.manifoldcf.rss_tests.BigCrawlDerbyLT" todir="test-derby-output/rss"/>
 
             <!-- MHL -->
         </junit>
@@ -2463,8 +2470,8 @@
     </target>
 
     <target name="run-wiki-tests-derby" depends="compile-wiki-tests,calculate-wiki-tests-condition" if="wiki-tests.include">
-        <mkdir dir="test-output/wiki"/>
-        <junit fork="true" maxmemory="128m" dir="test-output/wiki" outputtoformatters="true" showoutput="true" haltonfailure="true">
+        <mkdir dir="test-derby-output/wiki"/>
+        <junit fork="true" maxmemory="128m" dir="test-derby-output/wiki" outputtoformatters="true" showoutput="true" haltonfailure="true">
             <classpath>
                 <fileset dir="framework/lib">
                     <include name="*.jar"/>
@@ -2492,15 +2499,15 @@
             </classpath>
             <formatter type="brief" usefile="false"/>
 
-            <test name="org.apache.manifoldcf.wiki_tests.SanityDerbyIT" todir="test-output/wiki"/>
+            <test name="org.apache.manifoldcf.wiki_tests.SanityDerbyIT" todir="test-derby-output/wiki"/>
             <!-- MHL -->
 
         </junit>
     </target>
 
     <target name="run-wiki-loadtests-derby" depends="compile-wiki-tests,calculate-wiki-tests-condition" if="wiki-tests.include">
-        <mkdir dir="test-output/wiki"/>
-        <junit fork="true" maxmemory="256m" dir="test-output/wiki" outputtoformatters="true" showoutput="true" haltonfailure="true">
+        <mkdir dir="test-derby-output/wiki"/>
+        <junit fork="true" maxmemory="256m" dir="test-derby-output/wiki" outputtoformatters="true" showoutput="true" haltonfailure="true">
             <classpath>
                 <fileset dir="framework/lib">
                     <include name="*.jar"/>
@@ -2533,8 +2540,8 @@
     </target>
     
     <target name="run-alfresco-tests-derby" depends="compile-alfresco-tests,calculate-alfresco-tests-condition" if="alfresco-tests.include">
-        <mkdir dir="test-output/alfresco"/>
-        <junit fork="true" dir="test-output/alfresco" outputtoformatters="true" showoutput="true" haltonfailure="true">
+        <mkdir dir="test-derby-output/alfresco"/>
+        <junit fork="true" dir="test-derby-output/alfresco" outputtoformatters="true" showoutput="true" haltonfailure="true">
             <jvmarg value="-Xms512m"/>
             <jvmarg value="-Xmx1024m"/>
             <jvmarg value="-Xss1024k"/>
@@ -2572,14 +2579,14 @@
             </classpath>
             <formatter type="brief" usefile="false"/>
               
-            <test name="org.apache.manifoldcf.alfresco_tests.APISanityIT" todir="test-output/alfresco"/>
+            <test name="org.apache.manifoldcf.alfresco_tests.APISanityIT" todir="test-derby-output/alfresco"/>
         	
         </junit>
     </target>
 
     <target name="run-cmis-tests-derby" depends="compile-cmis-tests,calculate-cmis-tests-condition" if="cmis-tests.include">
-        <mkdir dir="test-output/cmis"/>
-        <junit fork="true" maxmemory="128m" dir="test-output/cmis" outputtoformatters="true" showoutput="true" haltonfailure="true">
+        <mkdir dir="test-derby-output/cmis"/>
+        <junit fork="true" maxmemory="128m" dir="test-derby-output/cmis" outputtoformatters="true" showoutput="true" haltonfailure="true">
             <classpath>
                 <fileset dir="framework/lib">
                     <include name="*.jar"/>
@@ -2609,7 +2616,7 @@
             </classpath>
             <formatter type="brief" usefile="false"/>
 	    
-            <test name="org.apache.manifoldcf.cmis_tests.APISanityIT" todir="test-output/cmis"/>
+            <test name="org.apache.manifoldcf.cmis_tests.APISanityIT" todir="test-derby-output/cmis"/>
 
         </junit>
     </target>
@@ -2687,8 +2694,8 @@
     </target>
 
     <target name="run-sharepoint-tests-derby" depends="compile-sharepoint-tests,calculate-sharepoint-tests-condition" if="sharepoint-tests.include">
-        <mkdir dir="test-output/sharepoint"/>
-        <junit fork="true" maxmemory="128m" dir="test-output/sharepoint" outputtoformatters="true" showoutput="true" haltonfailure="true">
+        <mkdir dir="test-derby-output/sharepoint"/>
+        <junit fork="true" maxmemory="128m" dir="test-derby-output/sharepoint" outputtoformatters="true" showoutput="true" haltonfailure="true">
             <classpath>
                 <fileset dir="framework/lib">
                     <include name="*.jar"/>
@@ -2720,8 +2727,8 @@
     </target>
 
     <target name="run-sharepoint-loadtests-derby" depends="compile-sharepoint-tests,calculate-sharepoint-tests-condition" if="sharepoint-tests.include">
-        <mkdir dir="test-output/sharepoint"/>
-        <junit fork="true" maxmemory="256m" dir="test-output/sharepoint" outputtoformatters="true" showoutput="true" haltonfailure="true">
+        <mkdir dir="test-derby-output/sharepoint"/>
+        <junit fork="true" maxmemory="256m" dir="test-derby-output/sharepoint" outputtoformatters="true" showoutput="true" haltonfailure="true">
             <classpath>
                 <fileset dir="framework/lib">
                     <include name="*.jar"/>
@@ -3593,8 +3600,8 @@
     </target>
 
     <target name="run-alfresco-tests-HSQLDB" depends="compile-alfresco-tests,calculate-alfresco-tests-condition" if="alfresco-tests.include">
-        <mkdir dir="test-output/alfresco"/>
-        <junit fork="true" maxmemory="128m" dir="test-output/alfresco" outputtoformatters="true" showoutput="true" haltonfailure="true">
+        <mkdir dir="test-HSQLDB-output/alfresco"/>
+        <junit fork="true" maxmemory="128m" dir="test-HSQLDB-output/alfresco" outputtoformatters="true" showoutput="true" haltonfailure="true">
             <classpath>
                 <fileset dir="framework/lib">
                     <include name="*.jar"/>
@@ -3630,8 +3637,8 @@
     </target>
 
     <target name="run-cmis-tests-HSQLDB" depends="compile-cmis-tests,calculate-cmis-tests-condition" if="cmis-tests.include">
-        <mkdir dir="test-output/cmis"/>
-        <junit fork="true" maxmemory="128m" dir="test-output/cmis" outputtoformatters="true" showoutput="true" haltonfailure="true">
+        <mkdir dir="test-HSQLDB-output/cmis"/>
+        <junit fork="true" maxmemory="128m" dir="test-HSQLDB-output/cmis" outputtoformatters="true" showoutput="true" haltonfailure="true">
             <classpath>
                 <fileset dir="framework/lib">
                     <include name="*.jar"/>
@@ -3856,8 +3863,9 @@
     <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"/>
-    <target name="build" depends="build-dev,cleanup-afterbuild"/>
+    <target name="build" depends="deliver-framework,deliver-open-connectors,deliver-output-connectors,deliver-lgpl-connectors,deliver-proprietary-connectors"/>
+    <target name="tmpclean" depends="cleanup-afterbuild"/>
+    <target name="buildcln" depends="build,tmpclean"/>
     <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"/>
     
@@ -3875,6 +3883,11 @@
           <exclude name="/connectors/*/dist/"/>
           <exclude name="/framework/dist/"/>
           <exclude name="**/test-output/"/>
+          <exclude name="**/test-derby-output/"/>
+          <exclude name="**/test-postgresql-output/"/>
+          <exclude name="**/test-HSQLDB-output/"/>
+          <exclude name="**/test-HSQLDBext-output/"/>
+          <exclude name="**/test-mysql-output/"/>
           <exclude name="/legacy-*/"/>
           <exclude name="/apache-manifoldcf-*"/>
         </zipfileset>
@@ -3891,13 +3904,18 @@
           <exclude name="/connectors/*/dist/"/>
           <exclude name="/framework/dist/"/>
           <exclude name="**/test-output/"/>
+          <exclude name="**/test-derby-output/"/>
+          <exclude name="**/test-postgresql-output/"/>
+          <exclude name="**/test-HSQLDB-output/"/>
+          <exclude name="**/test-HSQLDBext-output/"/>
+          <exclude name="**/test-mysql-output/"/>
           <exclude name="/legacy-*/"/>
           <exclude name="/apache-manifoldcf-*"/>
         </tarfileset>
       </tar>
     </target>
 
-    <target name="create-bin-zip" depends="build-dev,doc,javadoc,set-version">
+    <target name="create-bin-zip" depends="build,doc,javadoc,set-version">
       <zip destfile="apache-manifoldcf-${release-version}-bin.zip" update="false">
         <zipfileset dir="." prefix="apache-manifoldcf-${release-version}">
           <exclude name="/connectors/*/lib/"/>
@@ -3906,6 +3924,11 @@
           <exclude name="/connectors/*/dist/"/>
           <exclude name="/framework/dist/"/>
           <exclude name="**/test-output/"/>
+          <exclude name="**/test-derby-output/"/>
+          <exclude name="**/test-postgresql-output/"/>
+          <exclude name="**/test-HSQLDB-output/"/>
+          <exclude name="**/test-HSQLDBext-output/"/>
+          <exclude name="**/test-mysql-output/"/>
           <exclude name="/legacy-*/"/>
           <exclude name="**/*.pdf"/>
           <exclude name="/apache-manifoldcf-*"/>
@@ -3913,7 +3936,7 @@
       </zip>
     </target>
     
-    <target name="create-bin-tar" depends="build-dev,doc,javadoc,set-version">
+    <target name="create-bin-tar" depends="build,doc,javadoc,set-version">
       <tar destfile="apache-manifoldcf-${release-version}-bin.tar.gz" compression="gzip" longfile="gnu">
         <tarfileset dir="." prefix="apache-manifoldcf-${release-version}">
           <exclude name="/connectors/*/lib/"/>
@@ -3922,6 +3945,11 @@
           <exclude name="/connectors/*/dist/"/>
           <exclude name="/framework/dist/"/>
           <exclude name="**/test-output/"/>
+          <exclude name="**/test-derby-output/"/>
+          <exclude name="**/test-postgresql-output/"/>
+          <exclude name="**/test-HSQLDB-output/"/>
+          <exclude name="**/test-HSQLDBext-output/"/>
+          <exclude name="**/test-mysql-output/"/>
           <exclude name="/legacy-*/"/>
           <exclude name="**/*.pdf"/>
           <exclude name="/apache-manifoldcf-*"/>
@@ -3939,8 +3967,6 @@
 
     <target name="test-hs" depends="run-tests-HSQLDB-framework,run-tests-HSQLDBext-framework,run-tests-HSQLDB-open-connectors,run-tests-HSQLDB-lgpl-connectors,run-tests-HSQLDB-proprietary-connectors,end-to-end-tests-HSQLDB"/>
 
-    <target name="UI" depends="run-filesystem-UI-tests-derby"/>
-    
     <target name="load-dr" depends="end-to-end-loadtests-derby"/>
 
     <target name="load-pg" depends="end-to-end-loadtests-postgresql"/>
@@ -3951,9 +3977,11 @@
 
     <target name="test" depends="run-tests-framework,run-tests-open-connectors,run-tests-lgpl-connectors,run-tests-proprietary-connectors,test-dr,test-hs"/>
 
-    <target name="load" depends="load-dr,load-hs"/>
+    <target name="ldtest" depends="load-dr,load-hs"/>
 
-    <target name="all" depends="build-dev,javadoc,doc,image,test-dr,test-hs"/>
+    <target name="uitest" depends="run-filesystem-UI-tests-derby"/>
+    
+    <target name="all" depends="build,javadoc,doc,image,test-dr,test-hs"/>
 
     <target name="help">
       <echo level="info">
@@ -3962,36 +3990,38 @@ javadocs, generate site docs, run tests,
 
 Useful targets are:
 
-clean   - Clean the build area
-build   - Build executable code, jars, processes, and example,
-          under the 'dist' directory
-javadoc - Create the javadocs, under the 'dist/doc' directory
-test-dr - Compile and run Derby-based tests
-test-pg - Compile and run postgresql-based tests (needs Postgresql)
-test-my - Compile and run MySQL-based tests (needs MySQL)
-test-hs - Compile and run HSQLDB-based tests
-test    - Compile and run all local tests (Derby and HSQLDB)
-UI      - Compile and run all UI tests (needs Python)
-load-dr - Compile and run Derby-based load tests
-load-pg - Compile and run postgresql-based load tests (needs
-          Postgresql)
-load-my - Compile and run MySQL-based load tests (needs
-          MySQL)
-load-hs - Compile and run HSQLDB-based load tests
-load    - Compile and run all local load tests (Derby and HSQLDB)
-doc     - Build html site, under the 'dist/doc' directory
-          (requires Apache Forrest)
-image   - Build release image, under the '.' directory (requires
-          Apache Forrest)
-all     - Do it all (requires Apache Forrest)
+clean    - Clean the build and distribution areas
+build    - Build executable code, jars, processes, and examples,
+           under the 'dist' directory
+buildcln - Same as build, but clean up temp files
+javadoc  - Create the javadocs, under the 'dist/doc' directory
+test     - Compile and run all local tests (Derby and HSQLDB)
+uitest   - Compile and run all UI tests (needs Python)
+ldtest   - Compile and run all local load tests (Derby and HSQLDB)
+doc      - Build html site, under the 'dist/doc' directory
+           (requires Apache Forrest)
+tmpclean - Clean up temporary files used during build and testing
+image    - Build release image, under the '.' directory (requires
+           Apache Forrest)
+
+test-dr  - Compile and run Derby-based tests
+test-pg  - Compile and run postgresql-based tests (needs
+           Postgresql)
+test-my  - Compile and run MySQL-based tests (needs MySQL)
+test-hs  - Compile and run HSQLDB-based tests
+load-dr  - Compile and run Derby-based load tests
+load-pg  - Compile and run postgresql-based load tests (needs
+           Postgresql)
+load-my  - Compile and run MySQL-based load tests (needs MySQL)
+load-hs  - Compile and run HSQLDB-based load tests
+
+all      - Build code and docs, and test (requires Apache Forrest)
 
 run-script-interpreter - Run the ManifoldCF script interpreter
 
 download-dependencies  - Fetch non-redistributable dependencies
                          for all connectors, where possible
 
-build-dev              - Build for development (don't clean up)
-
 Use Apache Forrest version forrest-0.9-dev or higher.
       </echo>
     </target>
@@ -4015,10 +4045,11 @@ Use Apache Forrest version forrest-0.9-d
           <exclude name="**/build/"/>
           <exclude name="**/dist/"/>
           <exclude name="**/test-output/"/>
-          <exclude name="**/test-output-postgresql/"/>
-          <exclude name="**/test-output-mysql/"/>
-          <exclude name="**/test-output-HSQLDB/"/>
-          <exclude name="**/test-output-HSQLDBext/"/>
+          <exclude name="**/test-derby-output/"/>
+          <exclude name="**/test-postgresql-output/"/>
+          <exclude name="**/test-HSQLDB-output/"/>
+          <exclude name="**/test-HSQLDBext-output/"/>
+          <exclude name="**/test-mysql-output/"/>
           <exclude name="filenet/filenet-api/*.jar"/>
           <exclude name="documentum/dfc/*.jar"/>
           <exclude name="jcifs/jcifs/*.jar"/>
@@ -4037,10 +4068,11 @@ Use Apache Forrest version forrest-0.9-d
           <exclude name="**/build/"/>
           <exclude name="**/dist/"/>
           <exclude name="**/test-output/"/>
-          <exclude name="**/test-output-postgresql/"/>
-          <exclude name="**/test-output-mysql/"/>
-          <exclude name="**/test-output-HSQLDB/"/>
-          <exclude name="**/test-output-HSQLDBext/"/>
+          <exclude name="**/test-derby-output/"/>
+          <exclude name="**/test-postgresql-output/"/>
+          <exclude name="**/test-HSQLDB-output/"/>
+          <exclude name="**/test-HSQLDBext-output/"/>
+          <exclude name="**/test-mysql-output/"/>
           <exclude name="**/web-generated.xml"/>
           <exclude name="**/surefire-reports/"/>
           <exclude name="**/target/"/>

Propchange: incubator/lcf/trunk/connectors/alfresco/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Dec 31 17:23:35 2011
@@ -2,3 +2,4 @@ lib
 build
 dist
 target
+test-derby-output

Propchange: incubator/lcf/trunk/connectors/alfresco/alfresco-ws-client/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Dec 31 17:23:35 2011
@@ -0,0 +1 @@
+alfresco-web-service-client-3.4.e.jar

Modified: incubator/lcf/trunk/connectors/alfresco/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/alfresco/build.xml?rev=1226141&r1=1226140&r2=1226141&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/alfresco/build.xml (original)
+++ incubator/lcf/trunk/connectors/alfresco/build.xml Sat Dec 31 17:23:35 2011
@@ -20,6 +20,7 @@
     <target name="clean">
         <delete dir="build"/>
         <delete dir="dist"/>
+        <delete dir="test-derby-output"/>
     </target>
   
       <target name="calculate-condition">
@@ -97,6 +98,18 @@
         </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="precompile-check" if="canBuild">
@@ -113,10 +126,33 @@
     </target>
 
     <target name="run-tests"/>
-    <target name="run-tests-derby"/>
+    
+    <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">
+            <classpath>
+                <fileset dir="lib">
+                    <include name="*.jar"/>
+                </fileset>
+                <fileset dir="alfresco-ws-client">
+                    <include name="*.jar"/>
+                </fileset>
+                <pathelement location="build/connector/classes"/>
+                <pathelement location="build/connector-tests/classes"/>
+            </classpath>
+            <formatter type="brief" usefile="false"/>
+
+            <test name="org.apache.manifoldcf.crawler.connectors.alfresco.tests.SanityDerbyTest" todir="test-derby-output"/>
+            <!-- MHL -->
+        </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">

Propchange: incubator/lcf/trunk/connectors/cmis/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Dec 31 17:23:35 2011
@@ -1,7 +1,7 @@
 build
 dist
 lib
-manifoldcf.log
-derby.log
 target
+test-derby-output
+
 

Modified: incubator/lcf/trunk/connectors/cmis/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/cmis/build.xml?rev=1226141&r1=1226140&r2=1226141&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/cmis/build.xml (original)
+++ incubator/lcf/trunk/connectors/cmis/build.xml Sat Dec 31 17:23:35 2011
@@ -20,6 +20,7 @@
     <target name="clean">
         <delete dir="build"/>
         <delete dir="dist"/>
+        <delete dir="test-derby-output"/>
     </target>
     
     <target name="doc">
@@ -74,15 +75,48 @@
         </copy>
     </target>
 
+    <target name="compile-tests" depends="compile-connector">
+        <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">
       <mkdir dir="build/test-jar"/>
     </target>
+    
     <target name="run-tests"/>
-    <target name="run-tests-derby"/>
+    
+    <target name="run-tests-derby" depends="compile-tests">
+        <mkdir dir="test-derby-output"/>
+        <junit fork="true" maxmemory="128m" dir="test-derby-output" outputtoformatters="true" showoutput="true" haltonfailure="true">
+            <classpath>
+                <fileset dir="lib">
+                    <include name="*.jar"/>
+                </fileset>
+                <pathelement location="build/connector/classes"/>
+                <pathelement location="build/connector-tests/classes"/>
+            </classpath>
+            <formatter type="brief" usefile="false"/>
+
+            <test name="org.apache.manifoldcf.crawler.connectors.cmis.tests.SanityDerbyTest" todir="test-derby-output"/>
+            <!-- MHL -->
+        </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"/>
     
 </project>

Propchange: incubator/lcf/trunk/connectors/documentum/dfc/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Dec 31 17:23:35 2011
@@ -0,0 +1,3 @@
+dfcbase.jar
+dctm.jar
+dfc.jar

Propchange: incubator/lcf/trunk/connectors/filenet/filenet-api/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Dec 31 17:23:35 2011
@@ -0,0 +1 @@
+Jace.jar

Propchange: incubator/lcf/trunk/connectors/filesystem/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Dec 31 17:23:35 2011
@@ -2,11 +2,10 @@ build
 dist
 doc
 lib
-test-output
-test-output-postgresql
-test-output-HSQLDB
-manifoldcf.log
-derby.log
+test-derby-output
+test-postgresql-output
+test-HSQLDB-output
+test-mysql-output
 target
 
 

Modified: incubator/lcf/trunk/connectors/filesystem/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/filesystem/build.xml?rev=1226141&r1=1226140&r2=1226141&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/filesystem/build.xml (original)
+++ incubator/lcf/trunk/connectors/filesystem/build.xml Sat Dec 31 17:23:35 2011
@@ -20,10 +20,10 @@
     <target name="clean">
         <delete dir="build"/>
         <delete dir="dist"/>
-        <delete dir="test-output"/>
-        <delete dir="test-output-postgresql"/>
-        <delete dir="test-output-mysql"/>
-        <delete dir="test-output-HSQLDB"/>
+        <delete dir="test-derby-output"/>
+        <delete dir="test-postgresql-output"/>
+        <delete dir="test-mysql-output"/>
+        <delete dir="test-HSQLDB-output"/>
     </target>
     
     <target name="doc">
@@ -83,8 +83,8 @@
     <target name="run-tests" depends="compile-tests"/>
 
     <target name="run-tests-derby" depends="compile-tests">
-        <mkdir dir="test-output"/>
-        <junit fork="true" maxmemory="128m" dir="test-output" outputtoformatters="true" showoutput="true" haltonfailure="true">
+        <mkdir dir="test-derby-output"/>
+        <junit fork="true" maxmemory="128m" dir="test-derby-output" outputtoformatters="true" showoutput="true" haltonfailure="true">
             <classpath>
                 <fileset dir="lib">
                     <include name="*.jar"/>
@@ -94,14 +94,14 @@
             </classpath>
             <formatter type="brief" usefile="false"/>
 
-            <test name="org.apache.manifoldcf.crawler.connectors.filesystem.tests.SanityDerbyTest" todir="test-output"/>
+            <test name="org.apache.manifoldcf.crawler.connectors.filesystem.tests.SanityDerbyTest" todir="test-derby-output"/>
             <!-- MHL -->
         </junit>
     </target>
     
     <target name="run-tests-postgresql" depends="compile-tests">
-        <mkdir dir="test-output-postgresql"/>
-        <junit fork="true" maxmemory="128m" dir="test-output-postgresql" showoutput="true" haltonfailure="true">
+        <mkdir dir="test-postgresql-output"/>
+        <junit fork="true" maxmemory="128m" dir="test-postgresql-output" showoutput="true" haltonfailure="true">
             <classpath>
                 <fileset dir="lib">
                     <include name="*.jar"/>
@@ -109,14 +109,14 @@
                 <pathelement location="build/connector/classes"/>
                 <pathelement location="build/connector-tests/classes"/>
             </classpath>
-            <test name="org.apache.manifoldcf.crawler.connectors.filesystem.tests.SanityPostgresqlTest" todir="test-output-postgresql"/>
+            <test name="org.apache.manifoldcf.crawler.connectors.filesystem.tests.SanityPostgresqlTest" todir="test-postgresql-output"/>
             <!-- MHL -->
         </junit>
     </target>
 
     <target name="run-tests-mysql" depends="compile-tests">
-        <mkdir dir="test-output-mysql"/>
-        <junit fork="true" maxmemory="128m" dir="test-output-mysql" showoutput="true" haltonfailure="true">
+        <mkdir dir="test-mysql-output"/>
+        <junit fork="true" maxmemory="128m" dir="test-mysql-output" showoutput="true" haltonfailure="true">
             <classpath>
                 <fileset dir="lib">
                     <include name="*.jar"/>
@@ -124,14 +124,14 @@
                 <pathelement location="build/connector/classes"/>
                 <pathelement location="build/connector-tests/classes"/>
             </classpath>
-            <test name="org.apache.manifoldcf.crawler.connectors.filesystem.tests.SanityMySQLTest" todir="test-output-mysql"/>
+            <test name="org.apache.manifoldcf.crawler.connectors.filesystem.tests.SanityMySQLTest" todir="test-mysql-output"/>
             <!-- MHL -->
         </junit>
     </target>
 
     <target name="run-tests-HSQLDB" depends="compile-tests">
-        <mkdir dir="test-output-HSQLDB"/>
-        <junit fork="true" maxmemory="128m" dir="test-output-HSQLDB" showoutput="true" haltonfailure="true">
+        <mkdir dir="test-HSQLDB-output"/>
+        <junit fork="true" maxmemory="128m" dir="test-HSQLDB-output" showoutput="true" haltonfailure="true">
             <classpath>
                 <fileset dir="lib">
                     <include name="*.jar"/>
@@ -139,7 +139,7 @@
                 <pathelement location="build/connector/classes"/>
                 <pathelement location="build/connector-tests/classes"/>
             </classpath>
-            <test name="org.apache.manifoldcf.crawler.connectors.filesystem.tests.SanityHSQLDBTest" todir="test-output-HSQLDB"/>
+            <test name="org.apache.manifoldcf.crawler.connectors.filesystem.tests.SanityHSQLDBTest" todir="test-HSQLDB-output"/>
             <!-- MHL -->
         </junit>
     </target>

Propchange: incubator/lcf/trunk/connectors/jcifs/jcifs/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Dec 31 17:23:35 2011
@@ -0,0 +1 @@
+jcifs.jar

Propchange: incubator/lcf/trunk/connectors/jdbc/jdbc-drivers/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Dec 31 17:23:35 2011
@@ -0,0 +1,2 @@
+mysql-connector-java-5.1.18.jar
+jtds-1.2.4.jar

Propchange: incubator/lcf/trunk/connectors/livelink/lapi/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Dec 31 17:23:35 2011
@@ -0,0 +1 @@
+lapi.jar

Propchange: incubator/lcf/trunk/connectors/rss/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Dec 31 17:23:35 2011
@@ -3,5 +3,9 @@ dist
 doc
 lib
 test-output
+test-derby-output
+test-mysql-output
+test-postgresql-output
+test-HSQLDB-output
 target
 

Modified: incubator/lcf/trunk/connectors/rss/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/rss/build.xml?rev=1226141&r1=1226140&r2=1226141&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/rss/build.xml (original)
+++ incubator/lcf/trunk/connectors/rss/build.xml Sat Dec 31 17:23:35 2011
@@ -20,6 +20,7 @@
     <target name="clean">
         <delete dir="build"/>
         <delete dir="dist"/>
+        <delete dir="test-output"/>
     </target>
 
     <target name="doc">

Propchange: incubator/lcf/trunk/connectors/sharepoint/wsdls/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Dec 31 17:23:35 2011
@@ -0,0 +1,6 @@
+versions.wsdl
+usergroup.wsdl
+Permissions.wsdl
+Lists.wsdl
+webs.wsdl
+DspSts.wsdl

Modified: incubator/lcf/trunk/connectors/webcrawler/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/webcrawler/build.xml?rev=1226141&r1=1226140&r2=1226141&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/webcrawler/build.xml (original)
+++ incubator/lcf/trunk/connectors/webcrawler/build.xml Sat Dec 31 17:23:35 2011
@@ -20,6 +20,7 @@
     <target name="clean">
         <delete dir="build"/>
         <delete dir="dist"/>
+        <delete dir="test-output"/>
     </target>
 
     <target name="doc">

Propchange: incubator/lcf/trunk/connectors/wiki/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Dec 31 17:23:35 2011
@@ -1,8 +1,9 @@
 build
 dist
 lib
-test-output
-test-output-HSQLDB
-test-output-postgresql
+test-derby-output
+test-HSQLDB-output
+test-postgresql-output
+test-mysql-output
 target
 

Modified: incubator/lcf/trunk/connectors/wiki/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/wiki/build.xml?rev=1226141&r1=1226140&r2=1226141&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/wiki/build.xml (original)
+++ incubator/lcf/trunk/connectors/wiki/build.xml Sat Dec 31 17:23:35 2011
@@ -20,10 +20,10 @@
     <target name="clean">
         <delete dir="build"/>
         <delete dir="dist"/>
-        <delete dir="test-output"/>
-        <delete dir="test-output-postgresql"/>
-        <delete dir="test-output-mysql"/>
-        <delete dir="test-output-HSQLDB"/>
+        <delete dir="test-derby-output"/>
+        <delete dir="test-postgresql-output"/>
+        <delete dir="test-mysql-output"/>
+        <delete dir="test-HSQLDB-output"/>
     </target>
 
     <target name="doc">
@@ -87,8 +87,8 @@
     <target name="run-tests" depends="compile-tests"/>
     
     <target name="run-tests-derby" depends="compile-tests">
-        <mkdir dir="test-output"/>
-        <junit fork="true" maxmemory="128m" dir="test-output" outputtoformatters="true" showoutput="true" haltonfailure="true">
+        <mkdir dir="test-derby-output"/>
+        <junit fork="true" maxmemory="128m" dir="test-derby-output" outputtoformatters="true" showoutput="true" haltonfailure="true">
             <classpath>
                 <fileset dir="lib">
                     <include name="*.jar"/>
@@ -98,15 +98,15 @@
             </classpath>
             <formatter type="brief" usefile="false"/>
 
-            <test name="org.apache.manifoldcf.crawler.connectors.wiki.tests.SanityDerbyTest" todir="test-output"/>
+            <test name="org.apache.manifoldcf.crawler.connectors.wiki.tests.SanityDerbyTest" todir="test-derby-output"/>
             <!-- MHL -->
             
         </junit>
     </target>
     
     <target name="run-tests-postgresql" depends="compile-tests">
-        <mkdir dir="test-output-postgresql"/>
-        <junit fork="true" maxmemory="128m" dir="test-output-postgresql" showoutput="true" haltonfailure="true">
+        <mkdir dir="test-postgresql-output"/>
+        <junit fork="true" maxmemory="128m" dir="test-postgresql-output" showoutput="true" haltonfailure="true">
             <classpath>
                 <fileset dir="lib">
                     <include name="*.jar"/>
@@ -115,15 +115,15 @@
                 <pathelement location="build/connector-tests/classes"/>
             </classpath>
             
-            <test name="org.apache.manifoldcf.crawler.connectors.wiki.tests.SanityPostgresqlTest" todir="test-output-postgresql"/>
+            <test name="org.apache.manifoldcf.crawler.connectors.wiki.tests.SanityPostgresqlTest" todir="test-postgresql-output"/>
             <!-- MHL -->
             
         </junit>
     </target>
 
     <target name="run-tests-mysql" depends="compile-tests">
-        <mkdir dir="test-output-mysql"/>
-        <junit fork="true" maxmemory="128m" dir="test-output-mysql" showoutput="true" haltonfailure="true">
+        <mkdir dir="test-mysql-output"/>
+        <junit fork="true" maxmemory="128m" dir="test-mysql-output" showoutput="true" haltonfailure="true">
             <classpath>
                 <fileset dir="lib">
                     <include name="*.jar"/>
@@ -132,15 +132,15 @@
                 <pathelement location="build/connector-tests/classes"/>
             </classpath>
             
-            <test name="org.apache.manifoldcf.crawler.connectors.wiki.tests.SanityMySQLTest" todir="test-output-mysql"/>
+            <test name="org.apache.manifoldcf.crawler.connectors.wiki.tests.SanityMySQLTest" todir="test-mysql-output"/>
             <!-- MHL -->
             
         </junit>
     </target>
 
     <target name="run-tests-HSQLDB" depends="compile-tests">
-        <mkdir dir="test-output-HSQLDB"/>
-        <junit fork="true" maxmemory="128m" dir="test-output-HSQLDB" showoutput="true" haltonfailure="true">
+        <mkdir dir="test-HSQLDB-output"/>
+        <junit fork="true" maxmemory="128m" dir="test-HSQLDB-output" showoutput="true" haltonfailure="true">
             <classpath>
                 <fileset dir="lib">
                     <include name="*.jar"/>
@@ -149,7 +149,7 @@
                 <pathelement location="build/connector-tests/classes"/>
             </classpath>
             
-            <test name="org.apache.manifoldcf.crawler.connectors.wiki.tests.SanityHSQLDBTest" todir="test-output-HSQLDB"/>
+            <test name="org.apache.manifoldcf.crawler.connectors.wiki.tests.SanityHSQLDBTest" todir="test-HSQLDB-output"/>
             <!-- MHL -->
             
         </junit>

Propchange: incubator/lcf/trunk/framework/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Dec 31 17:23:35 2011
@@ -4,6 +4,9 @@ doc
 lib
 target
 test-output
-test-output-postgresql
-test-output-HSQLDB
-test-output-HSQLDBext
+test-derby-output
+test-postgresql-output
+test-HSQLDB-output
+test-HSQLDBext-output
+test-mysql-output
+

Modified: incubator/lcf/trunk/framework/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/build.xml?rev=1226141&r1=1226140&r2=1226141&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/build.xml (original)
+++ incubator/lcf/trunk/framework/build.xml Sat Dec 31 17:23:35 2011
@@ -21,10 +21,11 @@
       <delete dir="build"/>
       <delete dir="dist"/>
       <delete dir="test-output"/>
-      <delete dir="test-output-postgresql"/>
-      <delete dir="test-output-mysql"/>
-      <delete dir="test-output-HSQLDB"/>
-      <delete dir="test-output-HSQLDBext"/>
+      <delete dir="test-derby-output"/>
+      <delete dir="test-postgresql-output"/>
+      <delete dir="test-mysql-output"/>
+      <delete dir="test-HSQLDB-output"/>
+      <delete dir="test-HSQLDBext-output"/>
     </target>
     
     <target name="doc">
@@ -659,8 +660,8 @@
     <target name="run-tests" depends="compile-tests,run-script-engine-tests"/>
 
     <target name="run-tests-derby" depends="compile-tests">
-        <mkdir dir="test-output"/>
-        <junit fork="true" maxmemory="128m" dir="test-output" outputtoformatters="true" showoutput="true" haltonfailure="true">
+        <mkdir dir="test-derby-output"/>
+        <junit fork="true" maxmemory="128m" dir="test-derby-output" outputtoformatters="true" showoutput="true" haltonfailure="true">
             <classpath>
                 <fileset dir="lib">
                     <include name="*.jar"/>
@@ -677,15 +678,15 @@
             </classpath>
             <formatter type="brief" usefile="false"/>
 
-            <test name="org.apache.manifoldcf.agents.tests.SanityDerbyTest" todir="test-output"/>
-            <test name="org.apache.manifoldcf.crawler.tests.SanityDerbyTest" todir="test-output"/>
+            <test name="org.apache.manifoldcf.agents.tests.SanityDerbyTest" todir="test-derby-output"/>
+            <test name="org.apache.manifoldcf.crawler.tests.SanityDerbyTest" todir="test-derby-output"/>
             <!-- MHL -->
         </junit>
     </target>
 
     <target name="run-tests-postgresql" depends="compile-tests">
-        <mkdir dir="test-output-postgresql"/>
-        <junit fork="true" maxmemory="128m" dir="test-output-postgresql" outputtoformatters="true" showoutput="true" haltonfailure="true">
+        <mkdir dir="test-postgresql-output"/>
+        <junit fork="true" maxmemory="128m" dir="test-postgresql-output" outputtoformatters="true" showoutput="true" haltonfailure="true">
             <classpath>
                 <fileset dir="lib">
                     <include name="*.jar"/>
@@ -702,15 +703,15 @@
             </classpath>
             <formatter type="brief" usefile="false"/>
 
-            <test name="org.apache.manifoldcf.agents.tests.SanityPostgresqlTest" todir="test-output-postgresql"/>
-            <test name="org.apache.manifoldcf.crawler.tests.SanityPostgresqlTest" todir="test-output-postgresql"/>
+            <test name="org.apache.manifoldcf.agents.tests.SanityPostgresqlTest" todir="test-postgresql-output"/>
+            <test name="org.apache.manifoldcf.crawler.tests.SanityPostgresqlTest" todir="test-postgresql-output"/>
             <!-- MHL -->
         </junit>
     </target>
 
     <target name="run-tests-mysql" depends="compile-tests">
-        <mkdir dir="test-output-mysql"/>
-        <junit fork="true" maxmemory="128m" dir="test-output-mysql" outputtoformatters="true" showoutput="true" haltonfailure="true">
+        <mkdir dir="test-mysql-output"/>
+        <junit fork="true" maxmemory="128m" dir="test-mysql-output" outputtoformatters="true" showoutput="true" haltonfailure="true">
             <classpath>
                 <fileset dir="lib">
                     <include name="*.jar"/>
@@ -727,15 +728,15 @@
             </classpath>
             <formatter type="brief" usefile="false"/>
 
-            <test name="org.apache.manifoldcf.agents.tests.SanityMySQLTest" todir="test-output-mysql"/>
-            <test name="org.apache.manifoldcf.crawler.tests.SanityMySQLTest" todir="test-output-mysql"/>
+            <test name="org.apache.manifoldcf.agents.tests.SanityMySQLTest" todir="test-mysql-output"/>
+            <test name="org.apache.manifoldcf.crawler.tests.SanityMySQLTest" todir="test-mysql-output"/>
             <!-- MHL -->
         </junit>
     </target>
 
     <target name="run-tests-HSQLDB" depends="compile-tests">
-        <mkdir dir="test-output-HSQLDB"/>
-        <junit fork="true" maxmemory="128m" dir="test-output-HSQLDB" outputtoformatters="true" showoutput="true" haltonfailure="true">
+        <mkdir dir="test-HSQLDB-output"/>
+        <junit fork="true" maxmemory="128m" dir="test-HSQLDB-output" outputtoformatters="true" showoutput="true" haltonfailure="true">
             <classpath>
                 <fileset dir="lib">
                     <include name="*.jar"/>
@@ -752,15 +753,15 @@
             </classpath>
             <formatter type="brief" usefile="false"/>
 
-            <test name="org.apache.manifoldcf.agents.tests.SanityHSQLDBTest" todir="test-output-HSQLDB"/>
-            <test name="org.apache.manifoldcf.crawler.tests.SanityHSQLDBTest" todir="test-output-HSQLDB"/>
+            <test name="org.apache.manifoldcf.agents.tests.SanityHSQLDBTest" todir="test-HSQLDB-output"/>
+            <test name="org.apache.manifoldcf.crawler.tests.SanityHSQLDBTest" todir="test-HSQLDB-output"/>
             <!-- MHL -->
         </junit>
     </target>
 
     <target name="run-tests-HSQLDBext" depends="compile-tests">
-        <mkdir dir="test-output-HSQLDBext"/>
-        <junit fork="true" maxmemory="128m" dir="test-output-HSQLDBext" outputtoformatters="true" showoutput="true" haltonfailure="true">
+        <mkdir dir="test-HSQLDBext-output"/>
+        <junit fork="true" maxmemory="128m" dir="test-HSQLDBext-output" outputtoformatters="true" showoutput="true" haltonfailure="true">
             <classpath>
                 <fileset dir="lib">
                     <include name="*.jar"/>
@@ -777,8 +778,8 @@
             </classpath>
             <formatter type="brief" usefile="false"/>
 
-            <test name="org.apache.manifoldcf.agents.tests.SanityHSQLDBextTest" todir="test-output-HSQLDBext"/>
-            <test name="org.apache.manifoldcf.crawler.tests.SanityHSQLDBextTest" todir="test-output-HSQLDBext"/>
+            <test name="org.apache.manifoldcf.agents.tests.SanityHSQLDBextTest" todir="test-HSQLDBext-output"/>
+            <test name="org.apache.manifoldcf.crawler.tests.SanityHSQLDBextTest" todir="test-HSQLDBext-output"/>
             <!-- MHL -->
         </junit>
     </target>

Modified: incubator/lcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/BaseITDerby.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/BaseITDerby.java?rev=1226141&r1=1226140&r2=1226141&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/BaseITDerby.java (original)
+++ incubator/lcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/BaseITDerby.java Sat Dec 31 17:23:35 2011
@@ -32,10 +32,60 @@ public class BaseITDerby extends Connect
 {
   protected ManifoldCFInstance mcfInstance = new ManifoldCFInstance();
   
+  // Basic job support
+  
+  protected void waitJobInactiveNative(IJobManager jobManager, Long jobID, long maxTime)
+    throws ManifoldCFException, InterruptedException
+  {
+    mcfInstance.waitJobInactiveNative(jobManager,jobID,maxTime);
+  }
+  
+  protected void waitJobDeletedNative(IJobManager jobManager, Long jobID, long maxTime)
+    throws ManifoldCFException, InterruptedException
+  {
+    mcfInstance.waitJobDeletedNative(jobManager,jobID,maxTime);
+  }
+
   // API support
   
   // These methods allow communication with the ManifoldCF api webapp, via the locally-instantiated jetty
   
+  protected void startJobAPI(String jobIDString)
+    throws Exception
+  {
+    mcfInstance.startJobAPI(jobIDString);
+  }
+  
+  protected void deleteJobAPI(String jobIDString)
+    throws Exception
+  {
+    mcfInstance.deleteJobAPI(jobIDString);
+  }
+
+  protected String getJobStatusAPI(String jobIDString)
+    throws Exception
+  {
+    return mcfInstance.getJobStatusAPI(jobIDString);
+  }
+  
+  protected long getJobDocumentsProcessedAPI(String jobIDString)
+    throws Exception
+  {
+    return mcfInstance.getJobDocumentsProcessedAPI(jobIDString);
+  }
+
+  protected void waitJobInactiveAPI(String jobIDString, long maxTime)
+    throws Exception
+  {
+    mcfInstance.waitJobInactiveAPI(jobIDString,maxTime);
+  }
+
+  protected void waitJobDeletedAPI(String jobIDString, long maxTime)
+    throws Exception
+  {
+    mcfInstance.waitJobDeletedAPI(jobIDString,maxTime);
+  }
+  
   /** Construct a command url.
   */
   protected String makeAPIURL(String command)

Modified: incubator/lcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/BaseITHSQLDB.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/BaseITHSQLDB.java?rev=1226141&r1=1226140&r2=1226141&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/BaseITHSQLDB.java (original)
+++ incubator/lcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/BaseITHSQLDB.java Sat Dec 31 17:23:35 2011
@@ -32,10 +32,60 @@ public class BaseITHSQLDB extends Connec
 {
   protected ManifoldCFInstance mcfInstance = new ManifoldCFInstance();
   
+  // Basic job support
+  
+  protected void waitJobInactiveNative(IJobManager jobManager, Long jobID, long maxTime)
+    throws ManifoldCFException, InterruptedException
+  {
+    mcfInstance.waitJobInactiveNative(jobManager,jobID,maxTime);
+  }
+  
+  protected void waitJobDeletedNative(IJobManager jobManager, Long jobID, long maxTime)
+    throws ManifoldCFException, InterruptedException
+  {
+    mcfInstance.waitJobDeletedNative(jobManager,jobID,maxTime);
+  }
+
   // API support
   
   // These methods allow communication with the ManifoldCF api webapp, via the locally-instantiated jetty
   
+  protected void startJobAPI(String jobIDString)
+    throws Exception
+  {
+    mcfInstance.startJobAPI(jobIDString);
+  }
+  
+  protected void deleteJobAPI(String jobIDString)
+    throws Exception
+  {
+    mcfInstance.deleteJobAPI(jobIDString);
+  }
+
+  protected String getJobStatusAPI(String jobIDString)
+    throws Exception
+  {
+    return mcfInstance.getJobStatusAPI(jobIDString);
+  }
+  
+  protected long getJobDocumentsProcessedAPI(String jobIDString)
+    throws Exception
+  {
+    return mcfInstance.getJobDocumentsProcessedAPI(jobIDString);
+  }
+
+  protected void waitJobInactiveAPI(String jobIDString, long maxTime)
+    throws Exception
+  {
+    mcfInstance.waitJobInactiveAPI(jobIDString,maxTime);
+  }
+
+  protected void waitJobDeletedAPI(String jobIDString, long maxTime)
+    throws Exception
+  {
+    mcfInstance.waitJobDeletedAPI(jobIDString,maxTime);
+  }
+  
   /** Construct a command url.
   */
   protected String makeAPIURL(String command)

Modified: incubator/lcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/BaseITMySQL.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/BaseITMySQL.java?rev=1226141&r1=1226140&r2=1226141&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/BaseITMySQL.java (original)
+++ incubator/lcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/BaseITMySQL.java Sat Dec 31 17:23:35 2011
@@ -32,10 +32,60 @@ public class BaseITMySQL extends Connect
 {
   protected ManifoldCFInstance mcfInstance = new ManifoldCFInstance();
   
+  // Basic job support
+  
+  protected void waitJobInactiveNative(IJobManager jobManager, Long jobID, long maxTime)
+    throws ManifoldCFException, InterruptedException
+  {
+    mcfInstance.waitJobInactiveNative(jobManager,jobID,maxTime);
+  }
+  
+  protected void waitJobDeletedNative(IJobManager jobManager, Long jobID, long maxTime)
+    throws ManifoldCFException, InterruptedException
+  {
+    mcfInstance.waitJobDeletedNative(jobManager,jobID,maxTime);
+  }
+
   // API support
   
   // These methods allow communication with the ManifoldCF api webapp, via the locally-instantiated jetty
   
+  protected void startJobAPI(String jobIDString)
+    throws Exception
+  {
+    mcfInstance.startJobAPI(jobIDString);
+  }
+  
+  protected void deleteJobAPI(String jobIDString)
+    throws Exception
+  {
+    mcfInstance.deleteJobAPI(jobIDString);
+  }
+
+  protected String getJobStatusAPI(String jobIDString)
+    throws Exception
+  {
+    return mcfInstance.getJobStatusAPI(jobIDString);
+  }
+  
+  protected long getJobDocumentsProcessedAPI(String jobIDString)
+    throws Exception
+  {
+    return mcfInstance.getJobDocumentsProcessedAPI(jobIDString);
+  }
+
+  protected void waitJobInactiveAPI(String jobIDString, long maxTime)
+    throws Exception
+  {
+    mcfInstance.waitJobInactiveAPI(jobIDString,maxTime);
+  }
+
+  protected void waitJobDeletedAPI(String jobIDString, long maxTime)
+    throws Exception
+  {
+    mcfInstance.waitJobDeletedAPI(jobIDString,maxTime);
+  }
+  
   /** Construct a command url.
   */
   protected String makeAPIURL(String command)

Modified: incubator/lcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/BaseITPostgresql.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/BaseITPostgresql.java?rev=1226141&r1=1226140&r2=1226141&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/BaseITPostgresql.java (original)
+++ incubator/lcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/BaseITPostgresql.java Sat Dec 31 17:23:35 2011
@@ -32,10 +32,60 @@ public class BaseITPostgresql extends Co
 {
   protected ManifoldCFInstance mcfInstance = new ManifoldCFInstance();
   
+  // Basic job support
+  
+  protected void waitJobInactiveNative(IJobManager jobManager, Long jobID, long maxTime)
+    throws ManifoldCFException, InterruptedException
+  {
+    mcfInstance.waitJobInactiveNative(jobManager,jobID,maxTime);
+  }
+  
+  protected void waitJobDeletedNative(IJobManager jobManager, Long jobID, long maxTime)
+    throws ManifoldCFException, InterruptedException
+  {
+    mcfInstance.waitJobDeletedNative(jobManager,jobID,maxTime);
+  }
+
   // API support
   
   // These methods allow communication with the ManifoldCF api webapp, via the locally-instantiated jetty
   
+  protected void startJobAPI(String jobIDString)
+    throws Exception
+  {
+    mcfInstance.startJobAPI(jobIDString);
+  }
+  
+  protected void deleteJobAPI(String jobIDString)
+    throws Exception
+  {
+    mcfInstance.deleteJobAPI(jobIDString);
+  }
+
+  protected String getJobStatusAPI(String jobIDString)
+    throws Exception
+  {
+    return mcfInstance.getJobStatusAPI(jobIDString);
+  }
+  
+  protected long getJobDocumentsProcessedAPI(String jobIDString)
+    throws Exception
+  {
+    return mcfInstance.getJobDocumentsProcessedAPI(jobIDString);
+  }
+
+  protected void waitJobInactiveAPI(String jobIDString, long maxTime)
+    throws Exception
+  {
+    mcfInstance.waitJobInactiveAPI(jobIDString,maxTime);
+  }
+
+  protected void waitJobDeletedAPI(String jobIDString, long maxTime)
+    throws Exception
+  {
+    mcfInstance.waitJobDeletedAPI(jobIDString,maxTime);
+  }
+  
   /** Construct a command url.
   */
   protected String makeAPIURL(String command)

Modified: incubator/lcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/ManifoldCFInstance.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/ManifoldCFInstance.java?rev=1226141&r1=1226140&r2=1226141&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/ManifoldCFInstance.java (original)
+++ incubator/lcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/ManifoldCFInstance.java Sat Dec 31 17:23:35 2011
@@ -57,10 +57,198 @@ public class ManifoldCFInstance
     this.testPort = testPort;
   }
 
+  // Basic job support
+  
+  public void waitJobInactiveNative(IJobManager jobManager, Long jobID, long maxTime)
+    throws ManifoldCFException, InterruptedException
+  {
+    long startTime = System.currentTimeMillis();
+    while (System.currentTimeMillis() < startTime + maxTime)
+    {
+      JobStatus status = jobManager.getStatus(jobID);
+      if (status == null)
+        throw new ManifoldCFException("No such job: '"+jobID+"'");
+      int statusValue = status.getStatus();
+      switch (statusValue)
+      {
+        case JobStatus.JOBSTATUS_NOTYETRUN:
+          throw new ManifoldCFException("Job was never started.");
+        case JobStatus.JOBSTATUS_COMPLETED:
+          break;
+        case JobStatus.JOBSTATUS_ERROR:
+          throw new ManifoldCFException("Job reports error status: "+status.getErrorText());
+        default:
+          ManifoldCF.sleep(1000L);
+          continue;
+      }
+      return;
+    }
+    throw new ManifoldCFException("ManifoldCF did not terminate in the allotted time of "+new Long(maxTime).toString()+" milliseconds");
+  }
+  
+  public void waitJobDeletedNative(IJobManager jobManager, Long jobID, long maxTime)
+    throws ManifoldCFException, InterruptedException
+  {
+    long startTime = System.currentTimeMillis();
+    while (System.currentTimeMillis() < startTime + maxTime)
+    {
+      JobStatus status = jobManager.getStatus(jobID);
+      if (status == null)
+        return;
+      ManifoldCF.sleep(1000L);
+    }
+    throw new ManifoldCFException("ManifoldCF did not delete in the allotted time of "+new Long(maxTime).toString()+" milliseconds");
+  }
+    
+  public void waitJobRunningNative(IJobManager jobManager, Long jobID, long maxTime)
+    throws ManifoldCFException, InterruptedException
+  {
+    long startTime = System.currentTimeMillis();
+    while (System.currentTimeMillis() < startTime + maxTime)
+    {
+      JobStatus status = jobManager.getStatus(jobID);
+      if (status == null)
+        throw new ManifoldCFException("No such job: '"+jobID+"'");
+      int statusValue = status.getStatus();
+      switch (statusValue)
+      {
+        case JobStatus.JOBSTATUS_NOTYETRUN:
+          throw new ManifoldCFException("Job was never started.");
+        case JobStatus.JOBSTATUS_COMPLETED:
+          throw new ManifoldCFException("Job ended on its own!");
+        case JobStatus.JOBSTATUS_ERROR:
+          throw new ManifoldCFException("Job reports error status: "+status.getErrorText());
+        case JobStatus.JOBSTATUS_RUNNING:
+          break;
+        default:
+          ManifoldCF.sleep(1000L);
+          continue;
+      }
+      return;
+    }
+    throw new ManifoldCFException("ManifoldCF did not start in the allotted time of "+new Long(maxTime).toString()+" milliseconds");
+  }
+
   // API support
   
   // These methods allow communication with the ManifoldCF api webapp, via the locally-instantiated jetty
   
+  public void startJobAPI(String jobIDString)
+    throws Exception
+  {
+    Configuration requestObject = new Configuration();
+    
+    Configuration result = performAPIPutOperationViaNodes("start/"+jobIDString,201,requestObject);
+    int i = 0;
+    while (i < result.getChildCount())
+    {
+      ConfigurationNode resultNode = result.findChild(i++);
+      if (resultNode.getType().equals("error"))
+        throw new Exception(resultNode.getValue());
+    }
+  }
+  
+  public void deleteJobAPI(String jobIDString)
+    throws Exception
+  {
+    Configuration result = performAPIDeleteOperationViaNodes("jobs/"+jobIDString,200);
+    int i = 0;
+    while (i < result.getChildCount())
+    {
+      ConfigurationNode resultNode = result.findChild(i++);
+      if (resultNode.getType().equals("error"))
+        throw new Exception(resultNode.getValue());
+    }
+
+  }
+  
+  public String getJobStatusAPI(String jobIDString)
+    throws Exception
+  {
+    Configuration result = performAPIGetOperationViaNodes("jobstatusesnocounts/"+jobIDString,200);
+    String status = null;
+    int i = 0;
+    while (i < result.getChildCount())
+    {
+      ConfigurationNode resultNode = result.findChild(i++);
+      if (resultNode.getType().equals("error"))
+        throw new Exception(resultNode.getValue());
+      else if (resultNode.getType().equals("jobstatus"))
+      {
+        int j = 0;
+        while (j < resultNode.getChildCount())
+        {
+          ConfigurationNode childNode = resultNode.findChild(j++);
+          if (childNode.getType().equals("status"))
+            status = childNode.getValue();
+        }
+      }
+    }
+    return status;
+  }
+
+  public long getJobDocumentsProcessedAPI(String jobIDString)
+    throws Exception
+  {
+    Configuration result = performAPIGetOperationViaNodes("jobstatuses/"+jobIDString,200);
+    String documentsProcessed = null;
+    int i = 0;
+    while (i < result.getChildCount())
+    {
+      ConfigurationNode resultNode = result.findChild(i++);
+      if (resultNode.getType().equals("error"))
+        throw new Exception(resultNode.getValue());
+      else if (resultNode.getType().equals("jobstatus"))
+      {
+        int j = 0;
+        while (j < resultNode.getChildCount())
+        {
+          ConfigurationNode childNode = resultNode.findChild(j++);
+          if (childNode.getType().equals("documents_processed"))
+            documentsProcessed = childNode.getValue();
+        }
+      }
+    }
+    if (documentsProcessed == null)
+      throw new Exception("Expected a documents_processed field, didn't find it");
+    return new Long(documentsProcessed).longValue();
+  }
+
+  public void waitJobInactiveAPI(String jobIDString, long maxTime)
+    throws Exception
+  {
+    long startTime = System.currentTimeMillis();
+    while (System.currentTimeMillis() < startTime + maxTime)
+    {
+      String status = getJobStatusAPI(jobIDString);
+      if (status == null)
+        throw new Exception("No such job: '"+jobIDString+"'");
+      if (status.equals("not yet run"))
+        throw new Exception("Job was never started.");
+      if (status.equals("done"))
+        return;
+      if (status.equals("error"))
+        throw new Exception("Job reports error.");
+      ManifoldCF.sleep(1000L);
+      continue;
+    }
+    throw new ManifoldCFException("ManifoldCF did not terminate in the allotted time of "+new Long(maxTime).toString()+" milliseconds");
+  }
+  
+  public void waitJobDeletedAPI(String jobIDString, long maxTime)
+    throws Exception
+  {
+    long startTime = System.currentTimeMillis();
+    while (System.currentTimeMillis() < startTime + maxTime)
+    {
+      String status = getJobStatusAPI(jobIDString);
+      if (status == null)
+        return;
+      ManifoldCF.sleep(1000L);
+    }
+    throw new ManifoldCFException("ManifoldCF did not delete in the allotted time of "+new Long(maxTime).toString()+" milliseconds");
+  }
+    
   /** Construct a command url.
   */
   public String makeAPIURL(String command)

Propchange: incubator/lcf/trunk/lib/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Dec 31 17:23:35 2011
@@ -0,0 +1 @@
+mysql-connector-java-5.1.18.jar

Modified: incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/APISanityHSQLDBIT.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/APISanityHSQLDBIT.java?rev=1226141&r1=1226140&r2=1226141&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/APISanityHSQLDBIT.java (original)
+++ incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/APISanityHSQLDBIT.java Sat Dec 31 17:23:35 2011
@@ -18,11 +18,6 @@
 */
 package org.apache.manifoldcf.filesystem_tests;
 
-import org.apache.manifoldcf.core.interfaces.*;
-import org.apache.manifoldcf.agents.interfaces.*;
-import org.apache.manifoldcf.crawler.interfaces.*;
-import org.apache.manifoldcf.crawler.system.ManifoldCF;
-
 import java.io.*;
 import java.util.*;
 import org.junit.*;
@@ -30,375 +25,32 @@ import org.junit.*;
 /** This is a very basic sanity check */
 public class APISanityHSQLDBIT extends BaseHSQLDB
 {
+  protected APISanityTester tester;
+  
+  public APISanityHSQLDBIT()
+  {
+    tester = new APISanityTester(mcfInstance);
+  }
   
   @Before
-  public void createTestArea()
+  public void setupTester()
     throws Exception
   {
-    try
-    {
-      File f = new File("testdata");
-      removeDirectory(f);
-      createDirectory(f);
-    }
-    catch (Exception e)
-    {
-      e.printStackTrace();
-      throw e;
-    }
+    tester.setupTestArea();
   }
   
   @After
-  public void removeTestArea()
+  public void teardownTester()
     throws Exception
   {
-    try
-    {
-      File f = new File("testdata");
-      removeDirectory(f);
-    }
-    catch (Exception e)
-    {
-      e.printStackTrace();
-      throw e;
-    }
+    tester.teardownTestArea();
   }
   
   @Test
   public void sanityCheck()
     throws Exception
   {
-    try
-    {
-      // Hey, we were able to install the file system connector etc.
-      // Now, create a local test job and run it.
-      IThreadContext tc = ThreadContextFactory.make();
-      int i;
-      IJobManager jobManager = JobManagerFactory.make(tc);
-
-      // Create a basic file system connection, and save it.
-      ConfigurationNode connectionObject;
-      ConfigurationNode child;
-      Configuration requestObject;
-      Configuration result;
-      
-      connectionObject = new ConfigurationNode("repositoryconnection");
-      
-      child = new ConfigurationNode("name");
-      child.setValue("File Connection");
-      connectionObject.addChild(connectionObject.getChildCount(),child);
-      
-      child = new ConfigurationNode("class_name");
-      child.setValue("org.apache.manifoldcf.crawler.connectors.filesystem.FileConnector");
-      connectionObject.addChild(connectionObject.getChildCount(),child);
-      
-      child = new ConfigurationNode("description");
-      child.setValue("File Connection");
-      connectionObject.addChild(connectionObject.getChildCount(),child);
-
-      child = new ConfigurationNode("max_connections");
-      child.setValue("100");
-      connectionObject.addChild(connectionObject.getChildCount(),child);
-
-      requestObject = new Configuration();
-      requestObject.addChild(0,connectionObject);
-      
-      result = performAPIPutOperationViaNodes("repositoryconnections/File%20Connection",201,requestObject);
-      
-      i = 0;
-      while (i < result.getChildCount())
-      {
-        ConfigurationNode resultNode = result.findChild(i++);
-        if (resultNode.getType().equals("error"))
-          throw new Exception(resultNode.getValue());
-      }
-      
-      // Create a basic null output connection, and save it.
-      connectionObject = new ConfigurationNode("outputconnection");
-      
-      child = new ConfigurationNode("name");
-      child.setValue("Null Connection");
-      connectionObject.addChild(connectionObject.getChildCount(),child);
-      
-      child = new ConfigurationNode("class_name");
-      child.setValue("org.apache.manifoldcf.agents.output.nullconnector.NullConnector");
-      connectionObject.addChild(connectionObject.getChildCount(),child);
-      
-      child = new ConfigurationNode("description");
-      child.setValue("Null Connection");
-      connectionObject.addChild(connectionObject.getChildCount(),child);
-
-      child = new ConfigurationNode("max_connections");
-      child.setValue("100");
-      connectionObject.addChild(connectionObject.getChildCount(),child);
-
-      requestObject = new Configuration();
-      requestObject.addChild(0,connectionObject);
-      
-      result = performAPIPutOperationViaNodes("outputconnections/Null%20Connection",201,requestObject);
-      
-      i = 0;
-      while (i < result.getChildCount())
-      {
-        ConfigurationNode resultNode = result.findChild(i++);
-        if (resultNode.getType().equals("error"))
-          throw new Exception(resultNode.getValue());
-      }
-
-      // Create a job.
-      ConfigurationNode jobObject = new ConfigurationNode("job");
-      
-      child = new ConfigurationNode("description");
-      child.setValue("Test Job");
-      jobObject.addChild(jobObject.getChildCount(),child);
-
-      child = new ConfigurationNode("repository_connection");
-      child.setValue("File Connection");
-      jobObject.addChild(jobObject.getChildCount(),child);
-
-      child = new ConfigurationNode("output_connection");
-      child.setValue("Null Connection");
-      jobObject.addChild(jobObject.getChildCount(),child);
-
-      child = new ConfigurationNode("run_mode");
-      child.setValue("scan once");
-      jobObject.addChild(jobObject.getChildCount(),child);
-
-      child = new ConfigurationNode("start_mode");
-      child.setValue("manual");
-      jobObject.addChild(jobObject.getChildCount(),child);
-
-      child = new ConfigurationNode("hopcount_mode");
-      child.setValue("accurate");
-      jobObject.addChild(jobObject.getChildCount(),child);
-
-      child = new ConfigurationNode("document_specification");
-      // Crawl everything underneath the 'testdata' area
-      File testDataFile = new File("testdata").getCanonicalFile();
-      if (!testDataFile.exists())
-        throw new ManifoldCFException("Test data area not found!  Looking in "+testDataFile.toString());
-      if (!testDataFile.isDirectory())
-        throw new ManifoldCFException("Test data area not a directory!  Looking in "+testDataFile.toString());
-      ConfigurationNode sn = new ConfigurationNode("startpoint");
-      sn.setAttribute("path",testDataFile.toString());
-      ConfigurationNode n = new ConfigurationNode("include");
-      n.setAttribute("type","file");
-      n.setAttribute("match","*");
-      sn.addChild(sn.getChildCount(),n);
-      n = new ConfigurationNode("include");
-      n.setAttribute("type","directory");
-      n.setAttribute("match","*");
-      sn.addChild(sn.getChildCount(),n);
-      child.addChild(child.getChildCount(),sn);
-      jobObject.addChild(jobObject.getChildCount(),child);
-      
-      requestObject = new Configuration();
-      requestObject.addChild(0,jobObject);
-      
-      result = performAPIPostOperationViaNodes("jobs",201,requestObject);
-      
-      String jobIDString = null;
-      i = 0;
-      while (i < result.getChildCount())
-      {
-        ConfigurationNode resultNode = result.findChild(i++);
-        if (resultNode.getType().equals("error"))
-          throw new Exception(resultNode.getValue());
-        else if (resultNode.getType().equals("job_id"))
-          jobIDString = resultNode.getValue();
-      }
-      if (jobIDString == null)
-        throw new Exception("Missing job_id from return!");
-      
-      Long jobID = new Long(jobIDString);
-      
-      // Create the test data files.
-      createFile(new File("testdata/test1.txt"),"This is a test file");
-      createFile(new File("testdata/test2.txt"),"This is another test file");
-      createDirectory(new File("testdata/testdir"));
-      createFile(new File("testdata/testdir/test3.txt"),"This is yet another test file");
-      
-      ConfigurationNode requestNode;
-      
-      // Now, start the job, and wait until it completes.
-      startJob(jobIDString);
-      waitJobInactive(jobIDString, 120000L);
-
-      // Check to be sure we actually processed the right number of documents.
-      // The test data area has 3 documents and one directory, and we have to count the root directory too.
-      long count;
-      count = getJobDocumentsProcessed(jobIDString);
-      if (count != 5)
-        throw new ManifoldCFException("Wrong number of documents processed - expected 5, saw "+new Long(count).toString());
-      
-      // Add a file and recrawl
-      createFile(new File("testdata/testdir/test4.txt"),"Added file");
-
-      // Now, start the job, and wait until it completes.
-      startJob(jobIDString);
-      waitJobInactive(jobIDString, 120000L);
-
-      // The test data area has 4 documents and one directory, and we have to count the root directory too.
-      count = getJobDocumentsProcessed(jobIDString);
-      if (count != 6)
-        throw new ManifoldCFException("Wrong number of documents processed after add - expected 6, saw "+new Long(count).toString());
-
-      // Change a file, and recrawl
-      changeFile(new File("testdata/test1.txt"),"Modified contents");
-      
-      // Now, start the job, and wait until it completes.
-      startJob(jobIDString);
-      waitJobInactive(jobIDString, 120000L);
-
-      // The test data area has 4 documents and one directory, and we have to count the root directory too.
-      count = getJobDocumentsProcessed(jobIDString);
-      if (count != 6)
-        throw new ManifoldCFException("Wrong number of documents processed after change - expected 6, saw "+new Long(count).toString());
-      // We also need to make sure the new document was indexed.  Have to think about how to do this though.
-      // MHL
-      
-      // Delete a file, and recrawl
-      removeFile(new File("testdata/test2.txt"));
-      
-      // Now, start the job, and wait until it completes.
-      startJob(jobIDString);
-      waitJobInactive(jobIDString, 120000L);
-
-      // Check to be sure we actually processed the right number of documents.
-      // The test data area has 3 documents and one directory, and we have to count the root directory too.
-      count = getJobDocumentsProcessed(jobIDString);
-      if (count != 5)
-        throw new ManifoldCFException("Wrong number of documents processed after delete - expected 5, saw "+new Long(count).toString());
-
-      // Now, delete the job.
-      deleteJob(jobIDString);
-
-      waitJobDeleted(jobIDString, 120000L);
-      
-      // Cleanup is automatic by the base class, so we can feel free to leave jobs and connections lying around.
-    }
-    catch (Exception e)
-    {
-      e.printStackTrace();
-      throw e;
-    }
+    tester.executeTest();
   }
   
-  protected void startJob(String jobIDString)
-    throws Exception
-  {
-    Configuration requestObject = new Configuration();
-    
-    Configuration result = performAPIPutOperationViaNodes("start/"+jobIDString,201,requestObject);
-    int i = 0;
-    while (i < result.getChildCount())
-    {
-      ConfigurationNode resultNode = result.findChild(i++);
-      if (resultNode.getType().equals("error"))
-        throw new Exception(resultNode.getValue());
-    }
-  }
-  
-  protected void deleteJob(String jobIDString)
-    throws Exception
-  {
-    Configuration result = performAPIDeleteOperationViaNodes("jobs/"+jobIDString,200);
-    int i = 0;
-    while (i < result.getChildCount())
-    {
-      ConfigurationNode resultNode = result.findChild(i++);
-      if (resultNode.getType().equals("error"))
-        throw new Exception(resultNode.getValue());
-    }
-
-  }
-  
-  protected String getJobStatus(String jobIDString)
-    throws Exception
-  {
-    Configuration result = performAPIGetOperationViaNodes("jobstatusesnocounts/"+jobIDString,200);
-    String status = null;
-    int i = 0;
-    while (i < result.getChildCount())
-    {
-      ConfigurationNode resultNode = result.findChild(i++);
-      if (resultNode.getType().equals("error"))
-        throw new Exception(resultNode.getValue());
-      else if (resultNode.getType().equals("jobstatus"))
-      {
-        int j = 0;
-        while (j < resultNode.getChildCount())
-        {
-          ConfigurationNode childNode = resultNode.findChild(j++);
-          if (childNode.getType().equals("status"))
-            status = childNode.getValue();
-        }
-      }
-    }
-    return status;
-  }
-
-  protected long getJobDocumentsProcessed(String jobIDString)
-    throws Exception
-  {
-    Configuration result = performAPIGetOperationViaNodes("jobstatuses/"+jobIDString,200);
-    String documentsProcessed = null;
-    int i = 0;
-    while (i < result.getChildCount())
-    {
-      ConfigurationNode resultNode = result.findChild(i++);
-      if (resultNode.getType().equals("error"))
-        throw new Exception(resultNode.getValue());
-      else if (resultNode.getType().equals("jobstatus"))
-      {
-        int j = 0;
-        while (j < resultNode.getChildCount())
-        {
-          ConfigurationNode childNode = resultNode.findChild(j++);
-          if (childNode.getType().equals("documents_processed"))
-            documentsProcessed = childNode.getValue();
-        }
-      }
-    }
-    if (documentsProcessed == null)
-      throw new Exception("Expected a documents_processed field, didn't find it");
-    return new Long(documentsProcessed).longValue();
-  }
-
-  protected void waitJobInactive(String jobIDString, long maxTime)
-    throws Exception
-  {
-    long startTime = System.currentTimeMillis();
-    while (System.currentTimeMillis() < startTime + maxTime)
-    {
-      String status = getJobStatus(jobIDString);
-      if (status == null)
-        throw new Exception("No such job: '"+jobIDString+"'");
-      if (status.equals("not yet run"))
-        throw new Exception("Job was never started.");
-      if (status.equals("done"))
-        return;
-      if (status.equals("error"))
-        throw new Exception("Job reports error.");
-      ManifoldCF.sleep(1000L);
-      continue;
-    }
-    throw new ManifoldCFException("ManifoldCF did not terminate in the allotted time of "+new Long(maxTime).toString()+" milliseconds");
-  }
-  
-  protected void waitJobDeleted(String jobIDString, long maxTime)
-    throws Exception
-  {
-    long startTime = System.currentTimeMillis();
-    while (System.currentTimeMillis() < startTime + maxTime)
-    {
-      String status = getJobStatus(jobIDString);
-      if (status == null)
-        return;
-      ManifoldCF.sleep(1000L);
-    }
-    throw new ManifoldCFException("ManifoldCF did not delete in the allotted time of "+new Long(maxTime).toString()+" milliseconds");
-  }
-    
-
 }



Mime
View raw message