incubator-connectors-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1225655 - in /incubator/lcf/trunk: ./ loadtests/ tests/ tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/ tests/rss/ tests/rss/src/ tests/rss/src/test/ tests/rss/src/test/java/ tests/rss/src/test/java/org/ tests/rss/sr...
Date Thu, 29 Dec 2011 21:08:35 GMT
Author: kwright
Date: Thu Dec 29 21:08:34 2011
New Revision: 1225655

URL: http://svn.apache.org/viewvc?rev=1225655&view=rev
Log:
First bit of reorganization.  Pull loadtests into standard global test hierarchy.  Part of CONNECTORS-346.

Added:
    incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/BigCrawlDerbyLT.java
      - copied, changed from r1225358, incubator/lcf/trunk/loadtests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_loadtests/BigCrawlDerbyTest.java
    incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/BigCrawlHSQLDBLT.java
      - copied, changed from r1225358, incubator/lcf/trunk/loadtests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_loadtests/BigCrawlHSQLDBTest.java
    incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/BigCrawlMySQLLT.java
      - copied, changed from r1225358, incubator/lcf/trunk/loadtests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_loadtests/BigCrawlMySQLTest.java
    incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/BigCrawlPostgresqlLT.java
      - copied, changed from r1225358, incubator/lcf/trunk/loadtests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_loadtests/BigCrawlPostgresqlTest.java
    incubator/lcf/trunk/tests/rss/
    incubator/lcf/trunk/tests/rss/pom.xml   (with props)
    incubator/lcf/trunk/tests/rss/src/
    incubator/lcf/trunk/tests/rss/src/test/
    incubator/lcf/trunk/tests/rss/src/test/java/
    incubator/lcf/trunk/tests/rss/src/test/java/org/
    incubator/lcf/trunk/tests/rss/src/test/java/org/apache/
    incubator/lcf/trunk/tests/rss/src/test/java/org/apache/manifoldcf/
    incubator/lcf/trunk/tests/rss/src/test/java/org/apache/manifoldcf/rss_tests/
    incubator/lcf/trunk/tests/rss/src/test/java/org/apache/manifoldcf/rss_tests/BaseDerby.java
      - copied, changed from r1225358, incubator/lcf/trunk/loadtests/rss/src/test/java/org/apache/manifoldcf/rss_loadtests/BaseDerby.java
    incubator/lcf/trunk/tests/rss/src/test/java/org/apache/manifoldcf/rss_tests/BaseHSQLDB.java
      - copied, changed from r1225358, incubator/lcf/trunk/loadtests/rss/src/test/java/org/apache/manifoldcf/rss_loadtests/BaseHSQLDB.java
    incubator/lcf/trunk/tests/rss/src/test/java/org/apache/manifoldcf/rss_tests/BaseMySQL.java
      - copied, changed from r1225358, incubator/lcf/trunk/loadtests/rss/src/test/java/org/apache/manifoldcf/rss_loadtests/BaseMySQL.java
    incubator/lcf/trunk/tests/rss/src/test/java/org/apache/manifoldcf/rss_tests/BasePostgresql.java
      - copied, changed from r1225358, incubator/lcf/trunk/loadtests/rss/src/test/java/org/apache/manifoldcf/rss_loadtests/BasePostgresql.java
    incubator/lcf/trunk/tests/rss/src/test/java/org/apache/manifoldcf/rss_tests/BigCrawlDerbyLT.java
      - copied, changed from r1225358, incubator/lcf/trunk/loadtests/rss/src/test/java/org/apache/manifoldcf/rss_loadtests/BigCrawlDerbyTest.java
    incubator/lcf/trunk/tests/rss/src/test/java/org/apache/manifoldcf/rss_tests/BigCrawlHSQLDBLT.java
      - copied, changed from r1225358, incubator/lcf/trunk/loadtests/rss/src/test/java/org/apache/manifoldcf/rss_loadtests/BigCrawlHSQLDBTest.java
    incubator/lcf/trunk/tests/rss/src/test/java/org/apache/manifoldcf/rss_tests/BigCrawlMySQLLT.java
      - copied, changed from r1225358, incubator/lcf/trunk/loadtests/rss/src/test/java/org/apache/manifoldcf/rss_loadtests/BigCrawlMySQLTest.java
    incubator/lcf/trunk/tests/rss/src/test/java/org/apache/manifoldcf/rss_tests/BigCrawlPostgresqlLT.java
      - copied, changed from r1225358, incubator/lcf/trunk/loadtests/rss/src/test/java/org/apache/manifoldcf/rss_loadtests/BigCrawlPostgresqlTest.java
    incubator/lcf/trunk/tests/rss/src/test/java/org/apache/manifoldcf/rss_tests/MockRSSService.java
      - copied, changed from r1225358, incubator/lcf/trunk/loadtests/rss/src/test/java/org/apache/manifoldcf/rss_loadtests/MockRSSService.java
Removed:
    incubator/lcf/trunk/loadtests/
Modified:
    incubator/lcf/trunk/build.xml
    incubator/lcf/trunk/tests/pom.xml

Modified: incubator/lcf/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/build.xml?rev=1225655&r1=1225654&r2=1225655&view=diff
==============================================================================
--- incubator/lcf/trunk/build.xml (original)
+++ incubator/lcf/trunk/build.xml Thu Dec 29 21:08:34 2011
@@ -2039,41 +2039,9 @@
         </javac>
     </target>
 
-    <target name="compile-filesystem-loadtests" depends="build-framework,build-filesystem-connector,build-nulloutput-connector,calculate-filesystem-tests-condition,build-tests-filesystem-connector,build-tests-nulloutput-connector" if="filesystem-tests.include">
-        <mkdir dir="build/filesystem-loadtests/classes"/>
-        <javac srcdir="loadtests/filesystem/src/test/java" destdir="build/filesystem-loadtests/classes" target="1.5" source="1.5" debug="true" debuglevel="lines,vars,source">
-            <classpath>
-                 <fileset dir="framework/lib"> 
-                    <include name="*.jar"/> 
-                </fileset>
-                <fileset dir="framework/lib">
-                    <include name="*.jar"/>
-                </fileset>
-	      <fileset dir="framework/build/jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="framework/build/test-jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/filesystem/build/jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/filesystem/build/test-jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/nulloutput/build/jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/nulloutput/build/test-jar">
-		<include name="*.jar"/>
-	      </fileset>
-            </classpath>
-        </javac>
-    </target>
-
-    <target name="compile-rss-loadtests" depends="build-framework,build-rss-connector,build-nulloutput-connector,calculate-rss-tests-condition,build-tests-rss-connector,build-tests-nulloutput-connector" if="rss-tests.include">
-        <mkdir dir="build/rss-loadtests/classes"/>
-        <javac srcdir="loadtests/rss/src/test/java" destdir="build/rss-loadtests/classes" target="1.5" source="1.5" debug="true" debuglevel="lines,vars,source">
+    <target name="compile-rss-tests" depends="build-framework,build-rss-connector,build-nulloutput-connector,calculate-rss-tests-condition,build-tests-rss-connector,build-tests-nulloutput-connector" if="rss-tests.include">
+        <mkdir dir="build/rss-tests/classes"/>
+        <javac srcdir="tests/rss/src/test/java" destdir="build/rss-tests/classes" target="1.5" source="1.5" debug="true" debuglevel="lines,vars,source">
             <classpath>
                  <fileset dir="framework/lib"> 
                     <include name="*.jar"/> 
@@ -2135,38 +2103,6 @@
         </javac>
     </target>
 
-    <target name="compile-wiki-loadtests" depends="build-framework,build-filesystem-connector,build-nulloutput-connector,calculate-wiki-tests-condition,build-tests-wiki-connector,build-tests-nulloutput-connector" if="wiki-tests.include">
-        <mkdir dir="build/wiki-loadtests/classes"/>
-        <javac srcdir="loadtests/wiki/src/test/java" destdir="build/wiki-loadtests/classes" target="1.5" source="1.5" debug="true" debuglevel="lines,vars,source">
-            <classpath>
-                 <fileset dir="framework/lib"> 
-                    <include name="*.jar"/> 
-                </fileset>
-                <fileset dir="framework/lib">
-                    <include name="*.jar"/>
-                </fileset>
-	      <fileset dir="framework/build/jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="framework/build/test-jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/wiki/build/jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/wiki/build/test-jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/nulloutput/build/jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/nulloutput/build/test-jar">
-		<include name="*.jar"/>
-	      </fileset>
-            </classpath>
-        </javac>
-    </target>
-
     <target name="compile-sharepoint-tests" depends="build-framework,build-sharepoint-connector,build-nulloutput-connector,calculate-sharepoint-tests-condition,build-tests-sharepoint-connector,build-tests-nulloutput-connector" if="sharepoint-tests.include">
         <mkdir dir="build/sharepoint-tests/classes"/>
         <javac srcdir="tests/sharepoint/src/test/java" destdir="build/sharepoint-tests/classes" target="1.5" source="1.5" debug="true" debuglevel="lines,vars,source">
@@ -2196,35 +2132,6 @@
         </javac>
     </target>
 
-    <target name="compile-sharepoint-loadtests" depends="build-framework,build-sharepoint-connector,build-nulloutput-connector,calculate-sharepoint-tests-condition,build-tests-sharepoint-connector,build-tests-nulloutput-connector" if="sharepoint-tests.include">
-        <mkdir dir="build/sharepoint-loadtests/classes"/>
-        <javac srcdir="loadtests/sharepoint/src/test/java" destdir="build/sharepoint-loadtests/classes" target="1.5" source="1.5" debug="true" debuglevel="lines,vars,source">
-            <classpath>
-                <fileset dir="framework/lib">
-                    <include name="*.jar"/>
-                </fileset>
-	      <fileset dir="framework/build/jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="framework/build/test-jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/sharepoint/build/jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/sharepoint/build/test-jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/nulloutput/build/jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/nulloutput/build/test-jar">
-		<include name="*.jar"/>
-	      </fileset>
-            </classpath>
-        </javac>
-    </target>
-    
     <target name="compile-alfresco-tests" depends="build-framework,build-alfresco-connector,build-nulloutput-connector,calculate-alfresco-tests-condition,build-tests-alfresco-connector,build-tests-nulloutput-connector" if="alfresco-tests.include">
         <mkdir dir="build/alfresco-tests/classes"/>
         <javac srcdir="tests/alfresco/src/test/java" destdir="build/alfresco-tests/classes" target="1.5" source="1.5" debug="true" debuglevel="lines,vars,source">
@@ -2298,79 +2205,6 @@
         </javac>
     </target>
     
-    <target name="compile-alfresco-loadtests" depends="build-framework,build-alfresco-connector,build-nulloutput-connector,calculate-alfresco-tests-condition,build-tests-alfresco-connector,build-tests-nulloutput-connector" if="alfresco-tests.include">
-        <mkdir dir="build/alfresco-loadtests/classes"/>
-        <javac srcdir="loadtests/alfresco/src/test/java" destdir="build/alfresco-loadtests/classes" target="1.5" source="1.5" debug="true" debuglevel="lines,vars,source">
-            <classpath>
-          <fileset dir="lib">
-            <include name="h2*.jar"/>
-          </fileset>
-                 <fileset dir="framework/lib"> 
-                    <include name="*.jar"/> 
-                </fileset>
-                <fileset dir="framework/lib">
-                    <include name="*.jar"/>
-                </fileset>
-	      <fileset dir="framework/build/jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="framework/build/test-jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/alfresco/lib">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/alfresco/build/jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/alfresco/build/test-jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/nulloutput/build/jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/nulloutput/build/test-jar">
-		<include name="*.jar"/>
-	      </fileset>
-            </classpath>
-        </javac>
-    </target>
-
-    <target name="compile-cmis-loadtests" depends="build-framework,build-cmis-connector,build-nulloutput-connector,calculate-cmis-tests-condition,build-tests-cmis-connector,build-tests-nulloutput-connector" if="cmis-tests.include">
-        <mkdir dir="build/cmis-loadtests/classes"/>
-        <javac srcdir="loadtests/cmis/src/test/java" destdir="build/cmis-loadtests/classes" target="1.5" source="1.5" debug="true" debuglevel="lines,vars,source">
-            <classpath>
-                 <fileset dir="framework/lib"> 
-                    <include name="*.jar"/> 
-                </fileset>
-                <fileset dir="framework/lib">
-                    <include name="*.jar"/>
-                </fileset>
-	      <fileset dir="framework/build/jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="framework/build/test-jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/cmis/lib">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/cmis/build/jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/cmis/build/test-jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/nulloutput/build/jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/nulloutput/build/test-jar">
-		<include name="*.jar"/>
-	      </fileset>
-            </classpath>
-        </javac>
-    </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">
@@ -2454,7 +2288,7 @@
         </junit>
     </target>
 
-    <target name="run-filesystem-loadtests-derby" depends="compile-filesystem-loadtests,calculate-filesystem-tests-condition" if="filesystem-tests.include">
+    <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">
             <classpath>
@@ -2479,16 +2313,16 @@
 	      <fileset dir="connectors/nulloutput/build/test-jar">
 		<include name="*.jar"/>
 	      </fileset>
-                <pathelement location="build/filesystem-loadtests/classes"/>
+                <pathelement location="build/filesystem-tests/classes"/>
             </classpath>
             <formatter type="brief" usefile="false"/>
 	    
-            <test name="org.apache.manifoldcf.filesystem_loadtests.BigCrawlDerbyTest" todir="test-output/filesystem"/>
+            <test name="org.apache.manifoldcf.filesystem_tests.BigCrawlDerbyLT" todir="test-output/filesystem"/>
 	    
         </junit>
     </target>
 
-    <target name="run-rss-loadtests-derby" depends="compile-rss-loadtests,calculate-rss-tests-condition" if="rss-tests.include">
+    <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">
             <classpath>
@@ -2513,17 +2347,17 @@
 	      <fileset dir="connectors/nulloutput/build/test-jar">
 		<include name="*.jar"/>
 	      </fileset>
-                <pathelement location="build/rss-loadtests/classes"/>
+                <pathelement location="build/rss-tests/classes"/>
             </classpath>
             <formatter type="brief" usefile="false"/>
 
-            <test name="org.apache.manifoldcf.rss_loadtests.BigCrawlDerbyTest" todir="test-output/rss"/>
+            <test name="org.apache.manifoldcf.rss_tests.BigCrawlDerbyLT" todir="test-output/rss"/>
 
             <!-- MHL -->
         </junit>
     </target>
 
-    <target name="run-rss-loadtests-postgresql" depends="compile-rss-loadtests,calculate-rss-tests-condition" if="rss-tests.include">
+    <target name="run-rss-loadtests-postgresql" depends="compile-rss-tests,calculate-rss-tests-condition" if="rss-tests.include">
         <mkdir dir="test-postgresql-output/rss"/>
         <junit fork="true" maxmemory="384m" dir="test-postgresql-output/rss" outputtoformatters="true" showoutput="true" haltonfailure="true">
             <classpath>
@@ -2548,17 +2382,17 @@
 	      <fileset dir="connectors/nulloutput/build/test-jar">
 		<include name="*.jar"/>
 	      </fileset>
-                <pathelement location="build/rss-loadtests/classes"/>
+                <pathelement location="build/rss-tests/classes"/>
             </classpath>
             <formatter type="brief" usefile="false"/>
 
-            <test name="org.apache.manifoldcf.rss_loadtests.BigCrawlPostgresqlTest" todir="test-postgresql-output/rss"/>
+            <test name="org.apache.manifoldcf.rss_tests.BigCrawlPostgresqlLT" todir="test-postgresql-output/rss"/>
 
             <!-- MHL -->
         </junit>
     </target>
 
-    <target name="run-rss-loadtests-mysql" depends="compile-rss-loadtests,calculate-rss-tests-condition" if="rss-tests.include">
+    <target name="run-rss-loadtests-mysql" depends="compile-rss-tests,calculate-rss-tests-condition" if="rss-tests.include">
         <mkdir dir="test-mysql-output/rss"/>
         <junit fork="true" maxmemory="384m" dir="test-mysql-output/rss" outputtoformatters="true" showoutput="true" haltonfailure="true">
             <classpath>
@@ -2583,17 +2417,17 @@
 	      <fileset dir="connectors/nulloutput/build/test-jar">
 		<include name="*.jar"/>
 	      </fileset>
-                <pathelement location="build/rss-loadtests/classes"/>
+                <pathelement location="build/rss-tests/classes"/>
             </classpath>
             <formatter type="brief" usefile="false"/>
 
-            <test name="org.apache.manifoldcf.rss_loadtests.BigCrawlMySQLTest" todir="test-mysql-output/rss"/>
+            <test name="org.apache.manifoldcf.rss_tests.BigCrawlMySQLLT" todir="test-mysql-output/rss"/>
 
             <!-- MHL -->
         </junit>
     </target>
 
-    <target name="run-rss-loadtests-HSQLDB" depends="compile-rss-loadtests,calculate-rss-tests-condition" if="rss-tests.include">
+    <target name="run-rss-loadtests-HSQLDB" depends="compile-rss-tests,calculate-rss-tests-condition" if="rss-tests.include">
         <mkdir dir="test-HSQLDB-output/rss"/>
         <junit fork="true" maxmemory="384m" dir="test-HSQLDB-output/rss" outputtoformatters="true" showoutput="true" haltonfailure="true">
             <classpath>
@@ -2618,11 +2452,11 @@
 	      <fileset dir="connectors/nulloutput/build/test-jar">
 		<include name="*.jar"/>
 	      </fileset>
-                <pathelement location="build/rss-loadtests/classes"/>
+                <pathelement location="build/rss-tests/classes"/>
             </classpath>
             <formatter type="brief" usefile="false"/>
 
-            <test name="org.apache.manifoldcf.rss_loadtests.BigCrawlHSQLDBTest" todir="test-HSQLDB-output/rss"/>
+            <test name="org.apache.manifoldcf.rss_tests.BigCrawlHSQLDBLT" todir="test-HSQLDB-output/rss"/>
 
             <!-- MHL -->
         </junit>
@@ -2664,7 +2498,7 @@
         </junit>
     </target>
 
-    <target name="run-wiki-loadtests-derby" depends="compile-wiki-loadtests,calculate-wiki-tests-condition" if="wiki-tests.include">
+    <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">
             <classpath>
@@ -2689,7 +2523,7 @@
 	      <fileset dir="connectors/nulloutput/build/test-jar">
 		<include name="*.jar"/>
 	      </fileset>
-                <pathelement location="build/wiki-loadtests/classes"/>
+                <pathelement location="build/wiki-tests/classes"/>
                 <pathelement location="loadtests/wiki/src/test/resource"/>
             </classpath>
             <formatter type="brief" usefile="false"/>
@@ -2780,7 +2614,7 @@
         </junit>
     </target>
 
-    <target name="run-cmis-loadtests-derby" depends="compile-cmis-loadtests,calculate-cmis-tests-condition" if="cmis-tests.include">
+    <target name="run-cmis-loadtests-derby" depends="compile-cmis-tests,calculate-cmis-tests-condition" if="cmis-tests.include">
         <mkdir dir="test-derby-output/cmis"/>
         <junit fork="true" maxmemory="1024m" dir="test-derby-output/cmis" outputtoformatters="true" showoutput="true" haltonfailure="true">
             <classpath>
@@ -2808,7 +2642,7 @@
 	      <fileset dir="connectors/nulloutput/build/test-jar">
 		<include name="*.jar"/>
 	      </fileset>
-                <pathelement location="build/cmis-loadtests/classes"/>
+                <pathelement location="build/cmis-tests/classes"/>
             </classpath>
             <formatter type="brief" usefile="false"/>
 	    
@@ -2816,7 +2650,7 @@
         </junit>
     </target>
     
-    <target name="run-alfresco-loadtests-derby" depends="compile-alfresco-loadtests,calculate-alfresco-tests-condition" if="alfresco-tests.include">
+    <target name="run-alfresco-loadtests-derby" depends="compile-alfresco-tests,calculate-alfresco-tests-condition" if="alfresco-tests.include">
         <mkdir dir="test-derby-output/alfresco"/>
         <junit fork="true" maxmemory="1024m" dir="test-derby-output/alfresco" outputtoformatters="true" showoutput="true" haltonfailure="true">
             <classpath>
@@ -2844,7 +2678,7 @@
 	      <fileset dir="connectors/nulloutput/build/test-jar">
 		<include name="*.jar"/>
 	      </fileset>
-                <pathelement location="build/alfresco-loadtests/classes"/>
+                <pathelement location="build/alfresco-tests/classes"/>
             </classpath>
             <formatter type="brief" usefile="false"/>
 	    
@@ -2885,7 +2719,7 @@
         </junit>
     </target>
 
-    <target name="run-sharepoint-loadtests-derby" depends="compile-sharepoint-loadtests,calculate-sharepoint-tests-condition" if="sharepoint-tests.include">
+    <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">
             <classpath>
@@ -2910,7 +2744,7 @@
 	      <fileset dir="connectors/nulloutput/build/test-jar">
 		<include name="*.jar"/>
 	      </fileset>
-                <pathelement location="build/sharepoint-loadtests/classes"/>
+                <pathelement location="build/sharepoint-tests/classes"/>
             </classpath>
             <formatter type="brief" usefile="false"/>
 
@@ -2992,7 +2826,7 @@
         </junit>
     </target>
 
-    <target name="run-filesystem-loadtests-postgresql" depends="compile-filesystem-loadtests,calculate-filesystem-tests-condition" if="filesystem-tests.include">
+    <target name="run-filesystem-loadtests-postgresql" depends="compile-filesystem-tests,calculate-filesystem-tests-condition" if="filesystem-tests.include">
         <mkdir dir="test-postgresql-output/filesystem"/>
         <junit fork="true" maxmemory="256m" dir="test-postgresql-output/filesystem" outputtoformatters="true" showoutput="true" haltonfailure="true">
             <classpath>
@@ -3017,17 +2851,17 @@
 	      <fileset dir="connectors/nulloutput/build/test-jar">
 		<include name="*.jar"/>
 	      </fileset>
-                <pathelement location="build/filesystem-loadtests/classes"/>
+                <pathelement location="build/filesystem-tests/classes"/>
             </classpath>
             <formatter type="brief" usefile="false"/>
 
-            <test name="org.apache.manifoldcf.filesystem_loadtests.BigCrawlPostgresqlTest" todir="test-postgresql-output/filesystem"/>
+            <test name="org.apache.manifoldcf.filesystem_tests.BigCrawlPostgresqlLT" todir="test-postgresql-output/filesystem"/>
             <!-- MHL -->
             
         </junit>
     </target>
 
-    <target name="run-filesystem-loadtests-mysql" depends="compile-filesystem-loadtests,calculate-filesystem-tests-condition" if="filesystem-tests.include">
+    <target name="run-filesystem-loadtests-mysql" depends="compile-filesystem-tests,calculate-filesystem-tests-condition" if="filesystem-tests.include">
         <mkdir dir="test-mysql-output/filesystem"/>
         <junit fork="true" maxmemory="256m" dir="test-mysql-output/filesystem" outputtoformatters="true" showoutput="true" haltonfailure="true">
             <classpath>
@@ -3052,11 +2886,11 @@
 	      <fileset dir="connectors/nulloutput/build/test-jar">
 		<include name="*.jar"/>
 	      </fileset>
-                <pathelement location="build/filesystem-loadtests/classes"/>
+                <pathelement location="build/filesystem-tests/classes"/>
             </classpath>
             <formatter type="brief" usefile="false"/>
 
-            <test name="org.apache.manifoldcf.filesystem_loadtests.BigCrawlMySQLTest" todir="test-mysql-output/filesystem"/>
+            <test name="org.apache.manifoldcf.filesystem_tests.BigCrawlMySQLLT" todir="test-mysql-output/filesystem"/>
             <!-- MHL -->
             
         </junit>
@@ -3130,7 +2964,7 @@
         </junit>
     </target>
 
-    <target name="run-wiki-loadtests-postgresql" depends="compile-wiki-loadtests,calculate-wiki-tests-condition" if="wiki-tests.include">
+    <target name="run-wiki-loadtests-postgresql" depends="compile-wiki-tests,calculate-wiki-tests-condition" if="wiki-tests.include">
         <mkdir dir="test-postgresql-output/wiki"/>
         <junit fork="true" maxmemory="256m" dir="test-postgresql-output/wiki" outputtoformatters="true" showoutput="true" haltonfailure="true">
             <classpath>
@@ -3155,7 +2989,7 @@
 	      <fileset dir="connectors/nulloutput/build/test-jar">
 		<include name="*.jar"/>
 	      </fileset>
-                <pathelement location="build/wiki-loadtests/classes"/>
+                <pathelement location="build/wiki-tests/classes"/>
                 <pathelement location="loadtests/wiki/src/test/resource"/>
             </classpath>
             <formatter type="brief" usefile="false"/>
@@ -3165,7 +2999,7 @@
         </junit>
     </target>
 
-    <target name="run-wiki-loadtests-mysql" depends="compile-wiki-loadtests,calculate-wiki-tests-condition" if="wiki-tests.include">
+    <target name="run-wiki-loadtests-mysql" depends="compile-wiki-tests,calculate-wiki-tests-condition" if="wiki-tests.include">
         <mkdir dir="test-mysql-output/wiki"/>
         <junit fork="true" maxmemory="256m" dir="test-mysql-output/wiki" outputtoformatters="true" showoutput="true" haltonfailure="true">
             <classpath>
@@ -3190,7 +3024,7 @@
 	      <fileset dir="connectors/nulloutput/build/test-jar">
 		<include name="*.jar"/>
 	      </fileset>
-                <pathelement location="build/wiki-loadtests/classes"/>
+                <pathelement location="build/wiki-tests/classes"/>
                 <pathelement location="loadtests/wiki/src/test/resource"/>
             </classpath>
             <formatter type="brief" usefile="false"/>
@@ -3344,7 +3178,7 @@
         </junit>
     </target>
 
-    <target name="run-alfresco-loadtests-postgresql" depends="compile-alfresco-loadtests,calculate-alfresco-tests-condition" if="alfresco-tests.include">
+    <target name="run-alfresco-loadtests-postgresql" depends="compile-alfresco-tests,calculate-alfresco-tests-condition" if="alfresco-tests.include">
         <mkdir dir="test-postgresql-output/alfresco"/>
         <junit fork="true" maxmemory="1024m" dir="test-postgresql-output/alfresco" outputtoformatters="true" showoutput="true" haltonfailure="true">
             <classpath>
@@ -3372,14 +3206,14 @@
 	      <fileset dir="connectors/nulloutput/build/test-jar">
 		<include name="*.jar"/>
 	      </fileset>
-                <pathelement location="build/alfresco-loadtests/classes"/>
+                <pathelement location="build/alfresco-tests/classes"/>
             </classpath>
             <formatter type="brief" usefile="false"/>
 	    
         </junit>
     </target>
 
-    <target name="run-alfresco-loadtests-mysql" depends="compile-alfresco-loadtests,calculate-alfresco-tests-condition" if="alfresco-tests.include">
+    <target name="run-alfresco-loadtests-mysql" depends="compile-alfresco-tests,calculate-alfresco-tests-condition" if="alfresco-tests.include">
         <mkdir dir="test-mysql-output/alfresco"/>
         <junit fork="true" maxmemory="1024m" dir="test-mysql-output/alfresco" outputtoformatters="true" showoutput="true" haltonfailure="true">
             <classpath>
@@ -3407,14 +3241,14 @@
 	      <fileset dir="connectors/nulloutput/build/test-jar">
 		<include name="*.jar"/>
 	      </fileset>
-                <pathelement location="build/alfresco-loadtests/classes"/>
+                <pathelement location="build/alfresco-tests/classes"/>
             </classpath>
             <formatter type="brief" usefile="false"/>
 	    
         </junit>
     </target>
 
-    <target name="run-cmis-loadtests-postgresql" depends="compile-cmis-loadtests,calculate-cmis-tests-condition" if="cmis-tests.include">
+    <target name="run-cmis-loadtests-postgresql" depends="compile-cmis-tests,calculate-cmis-tests-condition" if="cmis-tests.include">
         <mkdir dir="test-postgresql-output/cmis"/>
         <junit fork="true" maxmemory="1024m" dir="test-postgresql-output/cmis" outputtoformatters="true" showoutput="true" haltonfailure="true">
             <classpath>
@@ -3442,7 +3276,7 @@
 	      <fileset dir="connectors/nulloutput/build/test-jar">
 		<include name="*.jar"/>
 	      </fileset>
-                <pathelement location="build/cmis-loadtests/classes"/>
+                <pathelement location="build/cmis-tests/classes"/>
             </classpath>
             <formatter type="brief" usefile="false"/>
 	    
@@ -3450,7 +3284,7 @@
         </junit>
     </target>
 
-    <target name="run-cmis-loadtests-mysql" depends="compile-cmis-loadtests,calculate-cmis-tests-condition" if="cmis-tests.include">
+    <target name="run-cmis-loadtests-mysql" depends="compile-cmis-tests,calculate-cmis-tests-condition" if="cmis-tests.include">
         <mkdir dir="test-mysql-output/cmis"/>
         <junit fork="true" maxmemory="1024m" dir="test-mysql-output/cmis" outputtoformatters="true" showoutput="true" haltonfailure="true">
             <classpath>
@@ -3478,7 +3312,7 @@
 	      <fileset dir="connectors/nulloutput/build/test-jar">
 		<include name="*.jar"/>
 	      </fileset>
-                <pathelement location="build/cmis-loadtests/classes"/>
+                <pathelement location="build/cmis-tests/classes"/>
             </classpath>
             <formatter type="brief" usefile="false"/>
 	    
@@ -3523,7 +3357,7 @@
         </junit>
     </target>
 
-    <target name="run-filesystem-loadtests-HSQLDB" depends="compile-filesystem-loadtests,calculate-filesystem-tests-condition" if="filesystem-tests.include">
+    <target name="run-filesystem-loadtests-HSQLDB" depends="compile-filesystem-tests,calculate-filesystem-tests-condition" if="filesystem-tests.include">
         <mkdir dir="test-HSQLDB-output/filesystem"/>
         <junit fork="true" maxmemory="384m" dir="test-HSQLDB-output/filesystem" outputtoformatters="true" showoutput="true" haltonfailure="true">
             <classpath>
@@ -3548,11 +3382,11 @@
 	      <fileset dir="connectors/nulloutput/build/test-jar">
 		<include name="*.jar"/>
 	      </fileset>
-                <pathelement location="build/filesystem-loadtests/classes"/>
+                <pathelement location="build/filesystem-tests/classes"/>
             </classpath>
             <formatter type="brief" usefile="false"/>
 	    
-            <test name="org.apache.manifoldcf.filesystem_loadtests.BigCrawlHSQLDBTest" todir="test-HSQLDB-output/filesystem"/>
+            <test name="org.apache.manifoldcf.filesystem_tests.BigCrawlHSQLDBLT" todir="test-HSQLDB-output/filesystem"/>
 
             <!-- MHL -->
         </junit>
@@ -3592,7 +3426,7 @@
         </junit>
     </target>
 
-    <target name="run-wiki-loadtests-HSQLDB" depends="compile-wiki-loadtests,calculate-wiki-tests-condition" if="wiki-tests.include">
+    <target name="run-wiki-loadtests-HSQLDB" depends="compile-wiki-tests,calculate-wiki-tests-condition" if="wiki-tests.include">
         <mkdir dir="test-HSQLDB-output/wiki"/>
         <junit fork="true" maxmemory="256m" dir="test-HSQLDB-output/wiki" outputtoformatters="true" showoutput="true" haltonfailure="true">
             <classpath>
@@ -3617,7 +3451,7 @@
 	      <fileset dir="connectors/nulloutput/build/test-jar">
 		<include name="*.jar"/>
 	      </fileset>
-                <pathelement location="build/wiki-loadtests/classes"/>
+                <pathelement location="build/wiki-tests/classes"/>
                 <pathelement location="loadtests/wiki/src/test/resource"/>
             </classpath>
             <formatter type="brief" usefile="false"/>
@@ -3692,7 +3526,7 @@
         </junit>
     </target>
 
-    <target name="run-sharepoint-loadtests-postgresql" depends="compile-sharepoint-loadtests,calculate-sharepoint-tests-condition" if="sharepoint-tests.include">
+    <target name="run-sharepoint-loadtests-postgresql" depends="compile-sharepoint-tests,calculate-sharepoint-tests-condition" if="sharepoint-tests.include">
         <mkdir dir="test-postgresql-output/sharepoint"/>
         <junit fork="true" maxmemory="256m" dir="test-postgresql-output/sharepoint" outputtoformatters="true" showoutput="true" haltonfailure="true">
             <classpath>
@@ -3717,7 +3551,7 @@
 	      <fileset dir="connectors/nulloutput/build/test-jar">
 		<include name="*.jar"/>
 	      </fileset>
-                <pathelement location="build/sharepoint-loadtests/classes"/>
+                <pathelement location="build/sharepoint-tests/classes"/>
             </classpath>
             <formatter type="brief" usefile="false"/>
 
@@ -3725,7 +3559,7 @@
         </junit>
     </target>
 
-    <target name="run-sharepoint-loadtests-mysql" depends="compile-sharepoint-loadtests,calculate-sharepoint-tests-condition" if="sharepoint-tests.include">
+    <target name="run-sharepoint-loadtests-mysql" depends="compile-sharepoint-tests,calculate-sharepoint-tests-condition" if="sharepoint-tests.include">
         <mkdir dir="test-mysql-output/sharepoint"/>
         <junit fork="true" maxmemory="256m" dir="test-mysql-output/sharepoint" outputtoformatters="true" showoutput="true" haltonfailure="true">
             <classpath>
@@ -3750,7 +3584,7 @@
 	      <fileset dir="connectors/nulloutput/build/test-jar">
 		<include name="*.jar"/>
 	      </fileset>
-                <pathelement location="build/sharepoint-loadtests/classes"/>
+                <pathelement location="build/sharepoint-tests/classes"/>
             </classpath>
             <formatter type="brief" usefile="false"/>
 
@@ -3831,7 +3665,7 @@
         </junit>
     </target>
     
-    <target name="run-alfresco-loadtests-HSQLDB" depends="compile-alfresco-loadtests,calculate-alfresco-tests-condition" if="alfresco-tests.include">
+    <target name="run-alfresco-loadtests-HSQLDB" depends="compile-alfresco-tests,calculate-alfresco-tests-condition" if="alfresco-tests.include">
         <mkdir dir="test-HSQLDB-output/alfresco"/>
         <junit fork="true" maxmemory="1024m" dir="test-HSQLDB-output/alfresco" outputtoformatters="true" showoutput="true" haltonfailure="true">
             <classpath>
@@ -3862,7 +3696,7 @@
 	      <fileset dir="connectors/nulloutput/build/test-jar">
 		<include name="*.jar"/>
 	      </fileset>
-                <pathelement location="build/alfresco-loadtests/classes"/>
+                <pathelement location="build/alfresco-tests/classes"/>
             </classpath>
             <formatter type="brief" usefile="false"/>
 	    
@@ -3871,7 +3705,7 @@
         </junit>
     </target>
 
-    <target name="run-cmis-loadtests-HSQLDB" depends="compile-cmis-loadtests,calculate-cmis-tests-condition" if="cmis-tests.include">
+    <target name="run-cmis-loadtests-HSQLDB" depends="compile-cmis-tests,calculate-cmis-tests-condition" if="cmis-tests.include">
         <mkdir dir="test-HSQLDB-output/cmis"/>
         <junit fork="true" maxmemory="1024m" dir="test-HSQLDB-output/cmis" outputtoformatters="true" showoutput="true" haltonfailure="true">
             <classpath>
@@ -3899,7 +3733,7 @@
 	      <fileset dir="connectors/nulloutput/build/test-jar">
 		<include name="*.jar"/>
 	      </fileset>
-                <pathelement location="build/cmis-loadtests/classes"/>
+                <pathelement location="build/cmis-tests/classes"/>
             </classpath>
             <formatter type="brief" usefile="false"/>
 	    
@@ -3940,7 +3774,7 @@
         </junit>
     </target>
 
-    <target name="run-sharepoint-loadtests-HSQLDB" depends="compile-sharepoint-loadtests,calculate-sharepoint-tests-condition" if="sharepoint-tests.include">
+    <target name="run-sharepoint-loadtests-HSQLDB" depends="compile-sharepoint-tests,calculate-sharepoint-tests-condition" if="sharepoint-tests.include">
         <mkdir dir="test-HSQLDB-output/sharepoint"/>
         <junit fork="true" maxmemory="256m" dir="test-HSQLDB-output/sharepoint" outputtoformatters="true" showoutput="true" haltonfailure="true">
             <classpath>
@@ -3965,7 +3799,7 @@
 	      <fileset dir="connectors/nulloutput/build/test-jar">
 		<include name="*.jar"/>
 	      </fileset>
-                <pathelement location="build/sharepoint-loadtests/classes"/>
+                <pathelement location="build/sharepoint-tests/classes"/>
             </classpath>
             <formatter type="brief" usefile="false"/>
 

Copied: incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/BigCrawlDerbyLT.java (from r1225358, incubator/lcf/trunk/loadtests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_loadtests/BigCrawlDerbyTest.java)
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/BigCrawlDerbyLT.java?p2=incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/BigCrawlDerbyLT.java&p1=incubator/lcf/trunk/loadtests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_loadtests/BigCrawlDerbyTest.java&r1=1225358&r2=1225655&rev=1225655&view=diff
==============================================================================
--- incubator/lcf/trunk/loadtests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_loadtests/BigCrawlDerbyTest.java (original)
+++ incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/BigCrawlDerbyLT.java Thu Dec 29 21:08:34 2011
@@ -16,7 +16,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package org.apache.manifoldcf.filesystem_loadtests;
+package org.apache.manifoldcf.filesystem_tests;
 
 import org.apache.manifoldcf.core.interfaces.*;
 import org.apache.manifoldcf.agents.interfaces.*;
@@ -28,7 +28,7 @@ import java.util.*;
 import org.junit.*;
 
 /** This is a very basic sanity check */
-public class BigCrawlDerbyTest extends BaseDerby
+public class BigCrawlDerbyLT extends BaseDerby
 {
   
   @Before

Copied: incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/BigCrawlHSQLDBLT.java (from r1225358, incubator/lcf/trunk/loadtests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_loadtests/BigCrawlHSQLDBTest.java)
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/BigCrawlHSQLDBLT.java?p2=incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/BigCrawlHSQLDBLT.java&p1=incubator/lcf/trunk/loadtests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_loadtests/BigCrawlHSQLDBTest.java&r1=1225358&r2=1225655&rev=1225655&view=diff
==============================================================================
--- incubator/lcf/trunk/loadtests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_loadtests/BigCrawlHSQLDBTest.java (original)
+++ incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/BigCrawlHSQLDBLT.java Thu Dec 29 21:08:34 2011
@@ -16,7 +16,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package org.apache.manifoldcf.filesystem_loadtests;
+package org.apache.manifoldcf.filesystem_tests;
 
 import org.apache.manifoldcf.core.interfaces.*;
 import org.apache.manifoldcf.agents.interfaces.*;
@@ -28,7 +28,7 @@ import java.util.*;
 import org.junit.*;
 
 /** This is a very basic sanity check */
-public class BigCrawlHSQLDBTest extends BaseHSQLDB
+public class BigCrawlHSQLDBLT extends BaseHSQLDB
 {
   
   @Before

Copied: incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/BigCrawlMySQLLT.java (from r1225358, incubator/lcf/trunk/loadtests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_loadtests/BigCrawlMySQLTest.java)
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/BigCrawlMySQLLT.java?p2=incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/BigCrawlMySQLLT.java&p1=incubator/lcf/trunk/loadtests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_loadtests/BigCrawlMySQLTest.java&r1=1225358&r2=1225655&rev=1225655&view=diff
==============================================================================
--- incubator/lcf/trunk/loadtests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_loadtests/BigCrawlMySQLTest.java (original)
+++ incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/BigCrawlMySQLLT.java Thu Dec 29 21:08:34 2011
@@ -16,7 +16,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package org.apache.manifoldcf.filesystem_loadtests;
+package org.apache.manifoldcf.filesystem_tests;
 
 import org.apache.manifoldcf.core.interfaces.*;
 import org.apache.manifoldcf.agents.interfaces.*;
@@ -28,7 +28,7 @@ import java.util.*;
 import org.junit.*;
 
 /** This is a very basic sanity check */
-public class BigCrawlMySQLTest extends BaseMySQL
+public class BigCrawlMySQLLT extends BaseMySQL
 {
   
   @Before

Copied: incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/BigCrawlPostgresqlLT.java (from r1225358, incubator/lcf/trunk/loadtests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_loadtests/BigCrawlPostgresqlTest.java)
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/BigCrawlPostgresqlLT.java?p2=incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/BigCrawlPostgresqlLT.java&p1=incubator/lcf/trunk/loadtests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_loadtests/BigCrawlPostgresqlTest.java&r1=1225358&r2=1225655&rev=1225655&view=diff
==============================================================================
--- incubator/lcf/trunk/loadtests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_loadtests/BigCrawlPostgresqlTest.java (original)
+++ incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/BigCrawlPostgresqlLT.java Thu Dec 29 21:08:34 2011
@@ -16,7 +16,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package org.apache.manifoldcf.filesystem_loadtests;
+package org.apache.manifoldcf.filesystem_tests;
 
 import org.apache.manifoldcf.core.interfaces.*;
 import org.apache.manifoldcf.agents.interfaces.*;
@@ -28,7 +28,7 @@ import java.util.*;
 import org.junit.*;
 
 /** This is a very basic sanity check */
-public class BigCrawlPostgresqlTest extends BasePostgresql
+public class BigCrawlPostgresqlLT extends BasePostgresql
 {
   
   @Before

Modified: incubator/lcf/trunk/tests/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/pom.xml?rev=1225655&r1=1225654&r2=1225655&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/pom.xml (original)
+++ incubator/lcf/trunk/tests/pom.xml Thu Dec 29 21:08:34 2011
@@ -33,6 +33,7 @@
     <module>cmis</module>
     <module>filesystem</module>
     <module>sharepoint</module>
+    <module>rss</module>
   </modules>
   <build>
     <defaultGoal>integration-test</defaultGoal>

Added: incubator/lcf/trunk/tests/rss/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/rss/pom.xml?rev=1225655&view=auto
==============================================================================
--- incubator/lcf/trunk/tests/rss/pom.xml (added)
+++ incubator/lcf/trunk/tests/rss/pom.xml Thu Dec 29 21:08:34 2011
@@ -0,0 +1,230 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <parent>
+    <groupId>org.apache.manifoldcf</groupId>
+    <artifactId>mcf-tests</artifactId>
+    <version>0.5.0-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+
+  <artifactId>mcf-rss-test</artifactId>
+  <name>ManifoldCF - Test - RSS</name>
+
+  <build>
+    <defaultGoal>integration-test</defaultGoal>
+    <plugins>
+      <plugin>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <executions>
+           <execution>
+            <id>copy-war</id>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>copy</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>target/dependency</outputDirectory>
+              <artifactItems>
+                <artifactItem>
+                  <groupId>${project.groupId}</groupId>
+                  <artifactId>mcf-api-service</artifactId>
+                  <version>${project.version}</version>
+                  <type>war</type>
+                  <overWrite>false</overWrite>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>${project.groupId}</groupId>
+                  <artifactId>mcf-authority-service</artifactId>
+                  <version>${project.version}</version>
+                  <type>war</type>
+                  <overWrite>false</overWrite>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>${project.groupId}</groupId>
+                  <artifactId>mcf-crawler-ui</artifactId>
+                  <version>${project.version}</version>
+                  <type>war</type>
+                  <overWrite>false</overWrite>
+                </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-failsafe-plugin</artifactId>
+        <version>2.10</version>
+        <configuration>
+          <skipTests>${skipITs}</skipTests>
+          <systemPropertyVariables>
+            <crawlerWarPath>../dependency/mcf-crawler-ui-${project.version}.war</crawlerWarPath>
+            <authorityserviceWarPath>../dependency/mcf-authority-service-${project.version}.war</authorityserviceWarPath>
+            <apiWarPath>../dependency/mcf-api-service-${project.version}.war</apiWarPath>
+          </systemPropertyVariables>
+          <excludes>
+            <exclude>**/*Postgresql*.java</exclude>
+            <exclude>**/*MySQL*.java</exclude>
+          </excludes>
+          <forkMode>always</forkMode>
+          <workingDirectory>target/test-output</workingDirectory>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+  <dependencies>
+    <!-- Internal dependencies -->
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>mcf-api-service</artifactId>
+      <version>${project.version}</version>
+      <type>war</type>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>mcf-authority-service</artifactId>
+      <version>${project.version}</version>
+      <type>war</type>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>mcf-crawler-ui</artifactId>
+      <version>${project.version}</version>
+      <type>war</type>
+    </dependency>
+
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>mcf-core</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>mcf-agents</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>mcf-pull-agent</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>mcf-rss-connector</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>mcf-nulloutput-connector</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mortbay.jetty</groupId>
+      <artifactId>jetty</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.mortbay.jetty</groupId>
+      <artifactId>jsp-api-2.1</artifactId>
+      <version>6.1.14</version>
+    </dependency>    
+    <dependency>
+      <groupId>javax.servlet.jsp</groupId>
+      <artifactId>jsp-api</artifactId>
+      <version>2.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.mortbay.jetty</groupId>
+      <artifactId>jsp-2.1-glassfish</artifactId>
+      <version>2.1.v20091210</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>mcf-core</artifactId>
+      <version>${project.version}</version>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>mcf-agents</artifactId>
+      <version>${project.version}</version>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>mcf-pull-agent</artifactId>
+      <version>${project.version}</version>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>${junit.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>postgresql</groupId>
+      <artifactId>postgresql</artifactId>
+      <version>${postgresql.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.hsqldb</groupId>
+      <artifactId>hsqldb</artifactId>
+      <version>${hsqldb.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.derby</groupId>
+      <artifactId>derby</artifactId>
+      <version>${derby.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>mysql</groupId>
+      <artifactId>mysql-connector-java</artifactId>
+      <version>${mysql.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-httpclient</groupId>
+      <artifactId>commons-httpclient-mcf</artifactId>
+      <version>3.1</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.1.1</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-codec</groupId>
+      <artifactId>commons-codec</artifactId>
+      <version>1.5</version>
+    </dependency>
+  </dependencies>
+</project>
\ No newline at end of file

Propchange: incubator/lcf/trunk/tests/rss/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/lcf/trunk/tests/rss/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Copied: incubator/lcf/trunk/tests/rss/src/test/java/org/apache/manifoldcf/rss_tests/BaseDerby.java (from r1225358, incubator/lcf/trunk/loadtests/rss/src/test/java/org/apache/manifoldcf/rss_loadtests/BaseDerby.java)
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/rss/src/test/java/org/apache/manifoldcf/rss_tests/BaseDerby.java?p2=incubator/lcf/trunk/tests/rss/src/test/java/org/apache/manifoldcf/rss_tests/BaseDerby.java&p1=incubator/lcf/trunk/loadtests/rss/src/test/java/org/apache/manifoldcf/rss_loadtests/BaseDerby.java&r1=1225358&r2=1225655&rev=1225655&view=diff
==============================================================================
--- incubator/lcf/trunk/loadtests/rss/src/test/java/org/apache/manifoldcf/rss_loadtests/BaseDerby.java (original)
+++ incubator/lcf/trunk/tests/rss/src/test/java/org/apache/manifoldcf/rss_tests/BaseDerby.java Thu Dec 29 21:08:34 2011
@@ -16,7 +16,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package org.apache.manifoldcf.rss_loadtests;
+package org.apache.manifoldcf.rss_tests;
 
 import org.apache.manifoldcf.core.interfaces.*;
 import org.apache.manifoldcf.agents.interfaces.*;

Copied: incubator/lcf/trunk/tests/rss/src/test/java/org/apache/manifoldcf/rss_tests/BaseHSQLDB.java (from r1225358, incubator/lcf/trunk/loadtests/rss/src/test/java/org/apache/manifoldcf/rss_loadtests/BaseHSQLDB.java)
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/rss/src/test/java/org/apache/manifoldcf/rss_tests/BaseHSQLDB.java?p2=incubator/lcf/trunk/tests/rss/src/test/java/org/apache/manifoldcf/rss_tests/BaseHSQLDB.java&p1=incubator/lcf/trunk/loadtests/rss/src/test/java/org/apache/manifoldcf/rss_loadtests/BaseHSQLDB.java&r1=1225358&r2=1225655&rev=1225655&view=diff
==============================================================================
--- incubator/lcf/trunk/loadtests/rss/src/test/java/org/apache/manifoldcf/rss_loadtests/BaseHSQLDB.java (original)
+++ incubator/lcf/trunk/tests/rss/src/test/java/org/apache/manifoldcf/rss_tests/BaseHSQLDB.java Thu Dec 29 21:08:34 2011
@@ -16,7 +16,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package org.apache.manifoldcf.rss_loadtests;
+package org.apache.manifoldcf.rss_tests;
 
 import org.apache.manifoldcf.core.interfaces.*;
 import org.apache.manifoldcf.agents.interfaces.*;

Copied: incubator/lcf/trunk/tests/rss/src/test/java/org/apache/manifoldcf/rss_tests/BaseMySQL.java (from r1225358, incubator/lcf/trunk/loadtests/rss/src/test/java/org/apache/manifoldcf/rss_loadtests/BaseMySQL.java)
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/rss/src/test/java/org/apache/manifoldcf/rss_tests/BaseMySQL.java?p2=incubator/lcf/trunk/tests/rss/src/test/java/org/apache/manifoldcf/rss_tests/BaseMySQL.java&p1=incubator/lcf/trunk/loadtests/rss/src/test/java/org/apache/manifoldcf/rss_loadtests/BaseMySQL.java&r1=1225358&r2=1225655&rev=1225655&view=diff
==============================================================================
--- incubator/lcf/trunk/loadtests/rss/src/test/java/org/apache/manifoldcf/rss_loadtests/BaseMySQL.java (original)
+++ incubator/lcf/trunk/tests/rss/src/test/java/org/apache/manifoldcf/rss_tests/BaseMySQL.java Thu Dec 29 21:08:34 2011
@@ -16,7 +16,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package org.apache.manifoldcf.rss_loadtests;
+package org.apache.manifoldcf.rss_tests;
 
 import org.apache.manifoldcf.core.interfaces.*;
 import org.apache.manifoldcf.agents.interfaces.*;

Copied: incubator/lcf/trunk/tests/rss/src/test/java/org/apache/manifoldcf/rss_tests/BasePostgresql.java (from r1225358, incubator/lcf/trunk/loadtests/rss/src/test/java/org/apache/manifoldcf/rss_loadtests/BasePostgresql.java)
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/rss/src/test/java/org/apache/manifoldcf/rss_tests/BasePostgresql.java?p2=incubator/lcf/trunk/tests/rss/src/test/java/org/apache/manifoldcf/rss_tests/BasePostgresql.java&p1=incubator/lcf/trunk/loadtests/rss/src/test/java/org/apache/manifoldcf/rss_loadtests/BasePostgresql.java&r1=1225358&r2=1225655&rev=1225655&view=diff
==============================================================================
--- incubator/lcf/trunk/loadtests/rss/src/test/java/org/apache/manifoldcf/rss_loadtests/BasePostgresql.java (original)
+++ incubator/lcf/trunk/tests/rss/src/test/java/org/apache/manifoldcf/rss_tests/BasePostgresql.java Thu Dec 29 21:08:34 2011
@@ -16,7 +16,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package org.apache.manifoldcf.rss_loadtests;
+package org.apache.manifoldcf.rss_tests;
 
 import org.apache.manifoldcf.core.interfaces.*;
 import org.apache.manifoldcf.agents.interfaces.*;

Copied: incubator/lcf/trunk/tests/rss/src/test/java/org/apache/manifoldcf/rss_tests/BigCrawlDerbyLT.java (from r1225358, incubator/lcf/trunk/loadtests/rss/src/test/java/org/apache/manifoldcf/rss_loadtests/BigCrawlDerbyTest.java)
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/rss/src/test/java/org/apache/manifoldcf/rss_tests/BigCrawlDerbyLT.java?p2=incubator/lcf/trunk/tests/rss/src/test/java/org/apache/manifoldcf/rss_tests/BigCrawlDerbyLT.java&p1=incubator/lcf/trunk/loadtests/rss/src/test/java/org/apache/manifoldcf/rss_loadtests/BigCrawlDerbyTest.java&r1=1225358&r2=1225655&rev=1225655&view=diff
==============================================================================
--- incubator/lcf/trunk/loadtests/rss/src/test/java/org/apache/manifoldcf/rss_loadtests/BigCrawlDerbyTest.java (original)
+++ incubator/lcf/trunk/tests/rss/src/test/java/org/apache/manifoldcf/rss_tests/BigCrawlDerbyLT.java Thu Dec 29 21:08:34 2011
@@ -16,7 +16,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package org.apache.manifoldcf.rss_loadtests;
+package org.apache.manifoldcf.rss_tests;
 
 import org.apache.manifoldcf.core.interfaces.*;
 import org.apache.manifoldcf.agents.interfaces.*;
@@ -30,7 +30,7 @@ import java.util.*;
 import org.junit.*;
 
 /** This is a very basic sanity check */
-public class BigCrawlDerbyTest extends BaseDerby
+public class BigCrawlDerbyLT extends BaseDerby
 {
 
   protected MockRSSService rssService = null;

Copied: incubator/lcf/trunk/tests/rss/src/test/java/org/apache/manifoldcf/rss_tests/BigCrawlHSQLDBLT.java (from r1225358, incubator/lcf/trunk/loadtests/rss/src/test/java/org/apache/manifoldcf/rss_loadtests/BigCrawlHSQLDBTest.java)
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/rss/src/test/java/org/apache/manifoldcf/rss_tests/BigCrawlHSQLDBLT.java?p2=incubator/lcf/trunk/tests/rss/src/test/java/org/apache/manifoldcf/rss_tests/BigCrawlHSQLDBLT.java&p1=incubator/lcf/trunk/loadtests/rss/src/test/java/org/apache/manifoldcf/rss_loadtests/BigCrawlHSQLDBTest.java&r1=1225358&r2=1225655&rev=1225655&view=diff
==============================================================================
--- incubator/lcf/trunk/loadtests/rss/src/test/java/org/apache/manifoldcf/rss_loadtests/BigCrawlHSQLDBTest.java (original)
+++ incubator/lcf/trunk/tests/rss/src/test/java/org/apache/manifoldcf/rss_tests/BigCrawlHSQLDBLT.java Thu Dec 29 21:08:34 2011
@@ -16,7 +16,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package org.apache.manifoldcf.rss_loadtests;
+package org.apache.manifoldcf.rss_tests;
 
 import org.apache.manifoldcf.core.interfaces.*;
 import org.apache.manifoldcf.agents.interfaces.*;
@@ -30,7 +30,7 @@ import java.util.*;
 import org.junit.*;
 
 /** This is a very basic sanity check */
-public class BigCrawlHSQLDBTest extends BaseHSQLDB
+public class BigCrawlHSQLDBLT extends BaseHSQLDB
 {
 
   protected MockRSSService rssService = null;

Copied: incubator/lcf/trunk/tests/rss/src/test/java/org/apache/manifoldcf/rss_tests/BigCrawlMySQLLT.java (from r1225358, incubator/lcf/trunk/loadtests/rss/src/test/java/org/apache/manifoldcf/rss_loadtests/BigCrawlMySQLTest.java)
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/rss/src/test/java/org/apache/manifoldcf/rss_tests/BigCrawlMySQLLT.java?p2=incubator/lcf/trunk/tests/rss/src/test/java/org/apache/manifoldcf/rss_tests/BigCrawlMySQLLT.java&p1=incubator/lcf/trunk/loadtests/rss/src/test/java/org/apache/manifoldcf/rss_loadtests/BigCrawlMySQLTest.java&r1=1225358&r2=1225655&rev=1225655&view=diff
==============================================================================
--- incubator/lcf/trunk/loadtests/rss/src/test/java/org/apache/manifoldcf/rss_loadtests/BigCrawlMySQLTest.java (original)
+++ incubator/lcf/trunk/tests/rss/src/test/java/org/apache/manifoldcf/rss_tests/BigCrawlMySQLLT.java Thu Dec 29 21:08:34 2011
@@ -16,7 +16,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package org.apache.manifoldcf.rss_loadtests;
+package org.apache.manifoldcf.rss_tests;
 
 import org.apache.manifoldcf.core.interfaces.*;
 import org.apache.manifoldcf.agents.interfaces.*;
@@ -30,7 +30,7 @@ import java.util.*;
 import org.junit.*;
 
 /** This is a very basic sanity check */
-public class BigCrawlMySQLTest extends BaseMySQL
+public class BigCrawlMySQLLT extends BaseMySQL
 {
 
   protected MockRSSService rssService = null;

Copied: incubator/lcf/trunk/tests/rss/src/test/java/org/apache/manifoldcf/rss_tests/BigCrawlPostgresqlLT.java (from r1225358, incubator/lcf/trunk/loadtests/rss/src/test/java/org/apache/manifoldcf/rss_loadtests/BigCrawlPostgresqlTest.java)
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/rss/src/test/java/org/apache/manifoldcf/rss_tests/BigCrawlPostgresqlLT.java?p2=incubator/lcf/trunk/tests/rss/src/test/java/org/apache/manifoldcf/rss_tests/BigCrawlPostgresqlLT.java&p1=incubator/lcf/trunk/loadtests/rss/src/test/java/org/apache/manifoldcf/rss_loadtests/BigCrawlPostgresqlTest.java&r1=1225358&r2=1225655&rev=1225655&view=diff
==============================================================================
--- incubator/lcf/trunk/loadtests/rss/src/test/java/org/apache/manifoldcf/rss_loadtests/BigCrawlPostgresqlTest.java (original)
+++ incubator/lcf/trunk/tests/rss/src/test/java/org/apache/manifoldcf/rss_tests/BigCrawlPostgresqlLT.java Thu Dec 29 21:08:34 2011
@@ -16,7 +16,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package org.apache.manifoldcf.rss_loadtests;
+package org.apache.manifoldcf.rss_tests;
 
 import org.apache.manifoldcf.core.interfaces.*;
 import org.apache.manifoldcf.agents.interfaces.*;
@@ -30,7 +30,7 @@ import java.util.*;
 import org.junit.*;
 
 /** This is a very basic sanity check */
-public class BigCrawlPostgresqlTest extends BasePostgresql
+public class BigCrawlPostgresqlLT extends BasePostgresql
 {
 
   protected MockRSSService rssService = null;

Copied: incubator/lcf/trunk/tests/rss/src/test/java/org/apache/manifoldcf/rss_tests/MockRSSService.java (from r1225358, incubator/lcf/trunk/loadtests/rss/src/test/java/org/apache/manifoldcf/rss_loadtests/MockRSSService.java)
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/rss/src/test/java/org/apache/manifoldcf/rss_tests/MockRSSService.java?p2=incubator/lcf/trunk/tests/rss/src/test/java/org/apache/manifoldcf/rss_tests/MockRSSService.java&p1=incubator/lcf/trunk/loadtests/rss/src/test/java/org/apache/manifoldcf/rss_loadtests/MockRSSService.java&r1=1225358&r2=1225655&rev=1225655&view=diff
==============================================================================
--- incubator/lcf/trunk/loadtests/rss/src/test/java/org/apache/manifoldcf/rss_loadtests/MockRSSService.java (original)
+++ incubator/lcf/trunk/tests/rss/src/test/java/org/apache/manifoldcf/rss_tests/MockRSSService.java Thu Dec 29 21:08:34 2011
@@ -16,7 +16,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package org.apache.manifoldcf.rss_loadtests;
+package org.apache.manifoldcf.rss_tests;
 
 import org.mortbay.jetty.Server;
 import org.mortbay.jetty.servlet.Context;



Mime
View raw message