Author: kwright
Date: Tue Sep 23 22:36:05 2014
New Revision: 1627170
URL: http://svn.apache.org/r1627170
Log:
Remove derby from framework
Removed:
manifoldcf/branches/CONNECTORS-1044/framework/agents/src/test/java/org/apache/manifoldcf/agents/tests/BaseDerby.java
manifoldcf/branches/CONNECTORS-1044/framework/agents/src/test/java/org/apache/manifoldcf/agents/tests/SanityDerbyTest.java
manifoldcf/branches/CONNECTORS-1044/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfaceDerby.java
manifoldcf/branches/CONNECTORS-1044/framework/core/src/test/java/org/apache/manifoldcf/core/tests/BaseDerby.java
manifoldcf/branches/CONNECTORS-1044/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/BaseDerby.java
manifoldcf/branches/CONNECTORS-1044/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/BaseITDerby.java
manifoldcf/branches/CONNECTORS-1044/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/ConnectorBaseDerby.java
manifoldcf/branches/CONNECTORS-1044/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/ConnectorBaseUIDerby.java
manifoldcf/branches/CONNECTORS-1044/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/SanityDerbyTest.java
Modified:
manifoldcf/branches/CONNECTORS-1044/build.xml
manifoldcf/branches/CONNECTORS-1044/framework/agents/pom.xml
manifoldcf/branches/CONNECTORS-1044/framework/api-service/pom.xml
manifoldcf/branches/CONNECTORS-1044/framework/authority-service/pom.xml
manifoldcf/branches/CONNECTORS-1044/framework/build.xml
manifoldcf/branches/CONNECTORS-1044/framework/buildfiles/connector-build.xml
manifoldcf/branches/CONNECTORS-1044/framework/combined-service/pom.xml
manifoldcf/branches/CONNECTORS-1044/framework/core/pom.xml
manifoldcf/branches/CONNECTORS-1044/framework/core/src/test/java/org/apache/manifoldcf/core/throttler/TestThrottler.java
manifoldcf/branches/CONNECTORS-1044/framework/crawler-ui/pom.xml
manifoldcf/branches/CONNECTORS-1044/framework/example-singleprocess/properties.xml
manifoldcf/branches/CONNECTORS-1044/framework/pull-agent/pom.xml
manifoldcf/branches/CONNECTORS-1044/pom.xml
Modified: manifoldcf/branches/CONNECTORS-1044/build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1044/build.xml?rev=1627170&r1=1627169&r2=1627170&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1044/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-1044/build.xml Tue Sep 23 22:36:05 2014
@@ -31,14 +31,14 @@
<target name="downloaded-condition">
<!-- Spot check a few of the dependent jars; no point including ALL of
them here... -->
- <available file="lib/derby.jar" property="derby-found"/>
+ <available file="lib/hsqldb.jar" property="hsqldb-found"/>
<available file="lib/jetty-server.jar" property="jetty-found"/>
<available file="lib/httpclient.jar" property="httpclient-found"/>
<available file="lib/xercesImpl.jar" property="xerces-found"/>
<available file="lib/fop.jar" property="fop-found"/>
<condition property="downloaded">
<and>
- <isset property="derby-found"/>
+ <isset property="hsqldb-found"/>
<isset property="jetty-found"/>
<isset property="httpclient-found"/>
<isset property="xerces-found"/>
@@ -88,10 +88,6 @@
<ant dir="framework" target="run-tests"/>
</target>
- <target name="run-tests-derby-framework" depends="setup-framework"
if="downloaded">
- <ant dir="framework" target="run-tests-derby"/>
- </target>
-
<target name="run-tests-postgresql-framework" depends="setup-framework"
if="downloaded">
<ant dir="framework" target="run-tests-postgresql"/>
</target>
@@ -269,10 +265,6 @@
<connectors-crawl target="run-tests"/>
</target>
- <target name="run-connectors-tests-derby" depends="deliver-framework"
if="downloaded">
- <connectors-crawl target="run-tests-derby"/>
- </target>
-
<target name="run-connectors-tests-HSQLDB" depends="deliver-framework"
if="downloaded">
<connectors-crawl target="run-tests-HSQLDB"/>
</target>
@@ -289,10 +281,6 @@
<connectors-crawl target="run-tests-mysql"/>
</target>
- <target name="run-connectors-IT-derby" depends="deliver-framework"
if="downloaded">
- <connectors-crawl target="run-IT-derby"/>
- </target>
-
<target name="run-connectors-IT-HSQLDB" depends="deliver-framework"
if="downloaded">
<connectors-crawl target="run-IT-HSQLDB"/>
</target>
@@ -309,10 +297,6 @@
<connectors-crawl target="run-IT-mysql"/>
</target>
- <target name="run-connectors-UI-derby" depends="deliver-framework"
if="downloaded">
- <connectors-crawl target="run-UI-derby"/>
- </target>
-
<target name="run-connectors-UI-HSQLDB" depends="deliver-framework"
if="downloaded">
<connectors-crawl target="run-UI-HSQLDB"/>
</target>
@@ -329,10 +313,6 @@
<connectors-crawl target="run-UI-mysql"/>
</target>
- <target name="run-connectors-LT-derby" depends="deliver-framework"
if="downloaded">
- <connectors-crawl target="run-LT-derby"/>
- </target>
-
<target name="run-connectors-LT-HSQLDB" depends="deliver-framework"
if="downloaded">
<connectors-crawl target="run-LT-HSQLDB"/>
</target>
@@ -397,7 +377,6 @@
<exclude name="framework/dist/"/>
<exclude name="**/target/"/>
<exclude name="**/test-output/"/>
- <exclude name="**/test-derby-output/"/>
<exclude name="**/test-postgresql-output/"/>
<exclude name="**/test-HSQLDB-output/"/>
<exclude name="**/test-HSQLDBext-output/"/>
@@ -437,7 +416,6 @@
<exclude name="framework/dist/"/>
<exclude name="**/target/"/>
<exclude name="**/test-output/"/>
- <exclude name="**/test-derby-output/"/>
<exclude name="**/test-postgresql-output/"/>
<exclude name="**/test-HSQLDB-output/"/>
<exclude name="**/test-HSQLDBext-output/"/>
@@ -497,29 +475,25 @@
<target name="image"
depends="create-source-zip,create-source-tar,create-lib-zip,create-lib-tar,create-bin-zip,create-bin-tar"/>
- <target name="test-dr"
depends="run-tests-derby-framework,run-connectors-tests-derby,run-connectors-IT-derby"/>
-
<target name="test-pg"
depends="run-tests-postgresql-framework,run-connectors-tests-postgresql,run-connectors-IT-postgresql"/>
<target name="test-my"
depends="run-tests-mysql-framework,run-connectors-tests-mysql,run-connectors-IT-mysql"/>
<target name="test-hs"
depends="run-tests-HSQLDB-framework,run-tests-HSQLDBext-framework,run-connectors-tests-HSQLDB,run-connectors-tests-HSQLDBext,run-connectors-IT-HSQLDB,run-connectors-IT-HSQLDBext"/>
- <target name="load-dr" depends="run-connectors-LT-derby"/>
-
<target name="load-pg" depends="run-connectors-LT-postgresql"/>
<target name="load-my" depends="run-connectors-LT-mysql"/>
<target name="load-hs"
depends="run-connectors-LT-HSQLDB,run-connectors-LT-HSQLDBext"/>
- <target name="test"
depends="run-tests-framework,run-connectors-tests,test-dr,test-hs"/>
+ <target name="test"
depends="run-tests-framework,run-connectors-tests,test-hs"/>
- <target name="ldtest"
depends="run-connectors-LT-derby,run-connectors-LT-HSQLDB"/>
+ <target name="ldtest" depends="run-connectors-LT-HSQLDB"/>
- <target name="uitest"
depends="run-connectors-UI-derby,run-connectors-UI-HSQLDB"/>
+ <target name="uitest" depends="run-connectors-UI-HSQLDB"/>
- <target name="all" depends="build,javadoc,doc,image,test-dr,test-hs"/>
+ <target name="all" depends="build,javadoc,doc,image,test-hs"/>
<target name="help">
<echo level="info">
@@ -533,21 +507,19 @@ build - Build executable code, jars,
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)
+test - Compile and run all local tests (HSQLDB)
uitest - Compile and run all UI tests (needs Python)
-ldtest - Compile and run all local load tests (Derby and HSQLDB)
+ldtest - Compile and run all local load tests (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)
@@ -585,7 +557,6 @@ Use Apache Forrest version forrest-0.9-d
<exclude name="**/build/"/>
<exclude name="**/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/"/>
@@ -605,7 +576,6 @@ Use Apache Forrest version forrest-0.9-d
<exclude name="**/build/"/>
<exclude name="**/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/"/>
@@ -698,76 +668,6 @@ Use Apache Forrest version forrest-0.9-d
</antcall>
</target>
- <target name="download-derby">
- <mkdir dir="lib"/>
- <property name="derby-version" value="10.10.2.0"/>
- <property name="derby-package" value="org/apache/derby"/>
- <antcall target="download-via-maven"><param name="project-path"
value="${derby-package}"/><param name="artifact-version"
value="${derby-version}"/><param name="target" value="lib"/>
- <param name="artifact-name" value="derby"/>
- <param name="artifact-type" value="jar"/>
- </antcall>
- <antcall target="download-via-maven"><param name="project-path"
value="${derby-package}"/><param name="artifact-version"
value="${derby-version}"/><param name="target" value="lib"/>
- <param name="artifact-name" value="derbytools"/>
- <param name="artifact-type" value="jar"/>
- </antcall>
- <antcall target="download-via-maven"><param name="project-path"
value="${derby-package}"/><param name="artifact-version"
value="${derby-version}"/><param name="target" value="lib"/>
- <param name="artifact-name" value="derbynet"/>
- <param name="artifact-type" value="jar"/>
- </antcall>
- <antcall target="download-via-maven"><param name="project-path"
value="${derby-package}"/><param name="artifact-version"
value="${derby-version}"/><param name="target" value="lib"/>
- <param name="artifact-name" value="derbyLocale_it"/>
- <param name="artifact-type" value="jar"/>
- </antcall>
- <antcall target="download-via-maven"><param name="project-path"
value="${derby-package}"/><param name="artifact-version"
value="${derby-version}"/><param name="target" value="lib"/>
- <param name="artifact-name" value="derbyLocale_de_DE"/>
- <param name="artifact-type" value="jar"/>
- </antcall>
- <antcall target="download-via-maven"><param name="project-path"
value="${derby-package}"/><param name="artifact-version"
value="${derby-version}"/><param name="target" value="lib"/>
- <param name="artifact-name" value="derbyLocale_es"/>
- <param name="artifact-type" value="jar"/>
- </antcall>
- <antcall target="download-via-maven"><param name="project-path"
value="${derby-package}"/><param name="artifact-version"
value="${derby-version}"/><param name="target" value="lib"/>
- <param name="artifact-name" value="derbyLocale_ja_JP"/>
- <param name="artifact-type" value="jar"/>
- </antcall>
- <antcall target="download-via-maven"><param name="project-path"
value="${derby-package}"/><param name="artifact-version"
value="${derby-version}"/><param name="target" value="lib"/>
- <param name="artifact-name" value="derbyLocale_cs"/>
- <param name="artifact-type" value="jar"/>
- </antcall>
- <antcall target="download-via-maven"><param name="project-path"
value="${derby-package}"/><param name="artifact-version"
value="${derby-version}"/><param name="target" value="lib"/>
- <param name="artifact-name" value="derbyLocale_zh_TW"/>
- <param name="artifact-type" value="jar"/>
- </antcall>
- <antcall target="download-via-maven"><param name="project-path"
value="${derby-package}"/><param name="artifact-version"
value="${derby-version}"/><param name="target" value="lib"/>
- <param name="artifact-name" value="derbyLocale_zh_CN"/>
- <param name="artifact-type" value="jar"/>
- </antcall>
- <antcall target="download-via-maven"><param name="project-path"
value="${derby-package}"/><param name="artifact-version"
value="${derby-version}"/><param name="target" value="lib"/>
- <param name="artifact-name" value="derbyLocale_pt_BR"/>
- <param name="artifact-type" value="jar"/>
- </antcall>
- <antcall target="download-via-maven"><param name="project-path"
value="${derby-package}"/><param name="artifact-version"
value="${derby-version}"/><param name="target" value="lib"/>
- <param name="artifact-name" value="derbyLocale_fr"/>
- <param name="artifact-type" value="jar"/>
- </antcall>
- <antcall target="download-via-maven"><param name="project-path"
value="${derby-package}"/><param name="artifact-version"
value="${derby-version}"/><param name="target" value="lib"/>
- <param name="artifact-name" value="derbyLocale_ru"/>
- <param name="artifact-type" value="jar"/>
- </antcall>
- <antcall target="download-via-maven"><param name="project-path"
value="${derby-package}"/><param name="artifact-version"
value="${derby-version}"/><param name="target" value="lib"/>
- <param name="artifact-name" value="derbyLocale_ko_KR"/>
- <param name="artifact-type" value="jar"/>
- </antcall>
- <antcall target="download-via-maven"><param name="project-path"
value="${derby-package}"/><param name="artifact-version"
value="${derby-version}"/><param name="target" value="lib"/>
- <param name="artifact-name" value="derbyLocale_hu"/>
- <param name="artifact-type" value="jar"/>
- </antcall>
- <antcall target="download-via-maven"><param name="project-path"
value="${derby-package}"/><param name="artifact-version"
value="${derby-version}"/><param name="target" value="lib"/>
- <param name="artifact-name" value="derbyLocale_pl"/>
- <param name="artifact-type" value="jar"/>
- </antcall>
- </target>
-
<target name="download-hsqldb">
<mkdir dir="lib"/>
<!--mkdir dir="build/download"/>
@@ -1810,7 +1710,7 @@ Use Apache Forrest version forrest-0.9-d
</antcall>
</target>
- <target name="make-core-deps"
depends="download-mongo-java-driver,download-jira-client,download-google-api-client,download-dropbox-client,download-solrj,download-zookeeper,download-httpcomponents,download-json,download-hsqldb,download-xerces,download-commons,download-elasticsearch-plugin,download-solr-plugins,download-sharepoint-plugins,download-jstl,download-xmlgraphics-commons,download-wstx-asl,download-xmlsec,download-xml-apis,download-wss4j,download-velocity,download-streambuffer,download-stax,download-servlet-api,download-xml-resolver,download-osgi,download-opensaml,download-mimepull,download-mail,download-log4j,download-junit,download-jaxws,download-glassfish,download-jaxb,download-tomcat,download-h2,download-h2-support,download-geronimo-specs,download-fop,download-derby,download-postgresql,download-axis,download-saaj,download-wsdl4j,download-castor,download-jetty,download-slf4j,download-xalan,download-activation,download-avalon-framework,download-poi,download-chemistry,do
wnload-ecj,download-hadoop,download-protobuf,download-tika,download-jackson">
+ <target name="make-core-deps"
depends="download-mongo-java-driver,download-jira-client,download-google-api-client,download-dropbox-client,download-solrj,download-zookeeper,download-httpcomponents,download-json,download-hsqldb,download-xerces,download-commons,download-elasticsearch-plugin,download-solr-plugins,download-sharepoint-plugins,download-jstl,download-xmlgraphics-commons,download-wstx-asl,download-xmlsec,download-xml-apis,download-wss4j,download-velocity,download-streambuffer,download-stax,download-servlet-api,download-xml-resolver,download-osgi,download-opensaml,download-mimepull,download-mail,download-log4j,download-junit,download-jaxws,download-glassfish,download-jaxb,download-tomcat,download-h2,download-h2-support,download-geronimo-specs,download-fop,download-postgresql,download-axis,download-saaj,download-wsdl4j,download-castor,download-jetty,download-slf4j,download-xalan,download-activation,download-avalon-framework,download-poi,download-chemistry,download-ecj,down
load-hadoop,download-protobuf,download-tika,download-jackson">
<copy todir="lib">
<fileset dir="lib-license" includes="*.txt"/>
</copy>
Modified: manifoldcf/branches/CONNECTORS-1044/framework/agents/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1044/framework/agents/pom.xml?rev=1627170&r1=1627169&r2=1627170&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1044/framework/agents/pom.xml (original)
+++ manifoldcf/branches/CONNECTORS-1044/framework/agents/pom.xml Tue Sep 23
22:36:05 2014
@@ -90,12 +90,6 @@
<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>
</dependencies>
</project>
\ No newline at end of file
Modified: manifoldcf/branches/CONNECTORS-1044/framework/api-service/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1044/framework/api-service/pom.xml?rev=1627170&r1=1627169&r2=1627170&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1044/framework/api-service/pom.xml (original)
+++ manifoldcf/branches/CONNECTORS-1044/framework/api-service/pom.xml Tue Sep
23 22:36:05 2014
@@ -69,102 +69,6 @@
<!-- database dependencies -->
<dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>${derby.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbytools</artifactId>
- <version>${derby.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbynet</artifactId>
- <version>${derby.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbyLocale_it</artifactId>
- <version>${derby.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbyLocale_de_DE</artifactId>
- <version>${derby.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbyLocale_es</artifactId>
- <version>${derby.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbyLocale_ja_JP</artifactId>
- <version>${derby.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbyLocale_cs</artifactId>
- <version>${derby.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbyLocale_zh_TW</artifactId>
- <version>${derby.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbyLocale_zh_CN</artifactId>
- <version>${derby.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbyLocale_pt_BR</artifactId>
- <version>${derby.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbyLocale_fr</artifactId>
- <version>${derby.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbyLocale_ru</artifactId>
- <version>${derby.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbyLocale_ko_KR</artifactId>
- <version>${derby.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbyLocale_hu</artifactId>
- <version>${derby.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbyLocale_pl</artifactId>
- <version>${derby.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>${hsqldb.version}</version>
Modified:
manifoldcf/branches/CONNECTORS-1044/framework/authority-service/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1044/framework/authority-service/pom.xml?rev=1627170&r1=1627169&r2=1627170&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1044/framework/authority-service/pom.xml
(original)
+++ manifoldcf/branches/CONNECTORS-1044/framework/authority-service/pom.xml Tue
Sep 23 22:36:05 2014
@@ -69,102 +69,6 @@
<!-- database dependencies -->
<dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>${derby.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbytools</artifactId>
- <version>${derby.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbynet</artifactId>
- <version>${derby.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbyLocale_it</artifactId>
- <version>${derby.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbyLocale_de_DE</artifactId>
- <version>${derby.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbyLocale_es</artifactId>
- <version>${derby.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbyLocale_ja_JP</artifactId>
- <version>${derby.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbyLocale_cs</artifactId>
- <version>${derby.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbyLocale_zh_TW</artifactId>
- <version>${derby.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbyLocale_zh_CN</artifactId>
- <version>${derby.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbyLocale_pt_BR</artifactId>
- <version>${derby.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbyLocale_fr</artifactId>
- <version>${derby.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbyLocale_ru</artifactId>
- <version>${derby.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbyLocale_ko_KR</artifactId>
- <version>${derby.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbyLocale_hu</artifactId>
- <version>${derby.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbyLocale_pl</artifactId>
- <version>${derby.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>${hsqldb.version}</version>
Modified: manifoldcf/branches/CONNECTORS-1044/framework/build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1044/framework/build.xml?rev=1627170&r1=1627169&r2=1627170&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1044/framework/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-1044/framework/build.xml Tue Sep 23 22:36:05
2014
@@ -23,7 +23,6 @@
<delete dir="build"/>
<delete dir="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"/>
@@ -74,7 +73,6 @@
</fileset>
<fileset dir="../lib">
<include name="postgresql*.jar"/>
- <include name="derby*.jar"/>
<include name="hsqldb*.jar"/>
</fileset>
<fileset dir="../lib-proprietary">
@@ -360,7 +358,6 @@
</fileset>
<fileset dir="../lib">
<include name="postgresql*.jar"/>
- <include name="derby*.jar"/>
<include name="hsqldb*.jar"/>
</fileset>
</copy>
@@ -412,7 +409,6 @@
</fileset>
<fileset dir="../lib">
<include name="postgresql*.jar"/>
- <include name="derby*.jar"/>
<include name="hsqldb*.jar"/>
</fileset>
<fileset dir="../lib-proprietary">
@@ -469,7 +465,6 @@
</fileset>
<fileset dir="../lib">
<include name="postgresql*.jar"/>
- <include name="derby*.jar"/>
<include name="hsqldb*.jar"/>
</fileset>
</copy>
@@ -522,7 +517,6 @@
</fileset>
<fileset dir="../lib">
<include name="postgresql*.jar"/>
- <include name="derby*.jar"/>
<include name="hsqldb*.jar"/>
</fileset>
<fileset dir="../lib-proprietary">
@@ -582,7 +576,6 @@
</fileset>
<fileset dir="../lib">
<include name="postgresql*.jar"/>
- <include name="derby*.jar"/>
<include name="hsqldb*.jar"/>
</fileset>
<fileset dir="build/jar">
@@ -643,7 +636,6 @@
</fileset>
<fileset dir="../lib">
<include name="postgresql*.jar"/>
- <include name="derby*.jar"/>
<include name="hsqldb*.jar"/>
</fileset>
<fileset dir="../lib-proprietary">
@@ -711,7 +703,6 @@
</fileset>
<fileset dir="../lib">
<include name="postgresql*.jar"/>
- <include name="derby*.jar"/>
<include name="hsqldb*.jar"/>
</fileset>
<fileset dir="build/jar">
@@ -774,7 +765,6 @@
</fileset>
<fileset dir="../lib">
<include name="postgresql*.jar"/>
- <include name="derby*.jar"/>
<include name="hsqldb*.jar"/>
</fileset>
<fileset dir="../lib-proprietary">
@@ -914,7 +904,6 @@
</fileset>
<fileset dir="../lib">
<include name="postgresql*.jar"/>
- <include name="derby*.jar"/>
<include name="hsqldb*.jar"/>
</fileset>
<fileset dir="build/jar">
@@ -1173,22 +1162,6 @@
<antcall target="general-add-lib-classpath"><param name="lib-jar"
value="slf4j-simple.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
<antcall target="general-add-lib-classpath"><param name="lib-jar"
value="mail.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
<antcall target="general-add-lib-classpath"><param name="lib-jar"
value="postgresql.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-add-lib-classpath"><param name="lib-jar"
value="derby.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-add-lib-classpath"><param name="lib-jar"
value="derbynet.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-add-lib-classpath"><param name="lib-jar"
value="derbytools.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-add-lib-classpath"><param name="lib-jar"
value="derbyLocale_cs.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-add-lib-classpath"><param name="lib-jar"
value="derbyLocale_de_DE.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-add-lib-classpath"><param name="lib-jar"
value="derbyLocale_es.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-add-lib-classpath"><param name="lib-jar"
value="derbyLocale_fr.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-add-lib-classpath"><param name="lib-jar"
value="derbyLocale_hu.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-add-lib-classpath"><param name="lib-jar"
value="derbyLocale_it.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-add-lib-classpath"><param name="lib-jar"
value="derbyLocale_ja_JP.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-add-lib-classpath"><param name="lib-jar"
value="derbyLocale_ko_KR.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-add-lib-classpath"><param name="lib-jar"
value="derbyLocale_pl.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-add-lib-classpath"><param name="lib-jar"
value="derbyLocale_pt_BR.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-add-lib-classpath"><param name="lib-jar"
value="derbyLocale_ru.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-add-lib-classpath"><param name="lib-jar"
value="derbyLocale_zh_CN.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-add-lib-classpath"><param name="lib-jar"
value="derbyLocale_zh_TW.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
<antcall target="general-add-lib-classpath"><param name="lib-jar"
value="hsqldb.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
<antcall target="general-add-lib-classpath"><param name="lib-jar"
value="mcf-core.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
<antcall target="general-add-lib-classpath"><param name="lib-jar"
value="mcf-agents.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
@@ -1379,24 +1352,7 @@
<property name="manifest-cp-7" value="${manifest-cp-5}
../lib/commons-io.jar"/>
<property name="manifest-cp-8" value="${manifest-cp-7}
../lib/commons-logging.jar"/>
<property name="manifest-cp-9" value="${manifest-cp-8}
../lib/hsqldb.jar"/>
- <property name="manifest-cp-10" value="${manifest-cp-9}
../lib/derbyclient.jar"/>
- <property name="manifest-cp-11" value="${manifest-cp-10}
../lib/derby.jar"/>
- <property name="manifest-cp-12" value="${manifest-cp-11}
../lib/derbyLocale_cs.jar"/>
- <property name="manifest-cp-13" value="${manifest-cp-12}
../lib/derbyLocale_de_DE.jar"/>
- <property name="manifest-cp-14" value="${manifest-cp-13}
../lib/derbyLocale_es.jar"/>
- <property name="manifest-cp-15" value="${manifest-cp-14}
../lib/derbyLocale_fr.jar"/>
- <property name="manifest-cp-16" value="${manifest-cp-15}
../lib/derbyLocale_hu.jar"/>
- <property name="manifest-cp-17" value="${manifest-cp-16}
../lib/derbyLocale_it.jar"/>
- <property name="manifest-cp-18" value="${manifest-cp-17}
../lib/derbyLocale_ja_JP"/>
- <property name="manifest-cp-19" value="${manifest-cp-18}
../lib/derbyLocale_ko_KR.jar"/>
- <property name="manifest-cp-20" value="${manifest-cp-19}
../lib/derbyLocale_pl.jar"/>
- <property name="manifest-cp-21" value="${manifest-cp-20}
../lib/derbyLocale_pt_BR.jar"/>
- <property name="manifest-cp-22" value="${manifest-cp-21}
../lib/derbyLocale_ru.jar"/>
- <property name="manifest-cp-23" value="${manifest-cp-22}
../lib/derbyLocale_zh_CN.jar"/>
- <property name="manifest-cp-24" value="${manifest-cp-23}
../lib/derbyLocale_zh_TW.jar"/>
- <property name="manifest-cp-25" value="${manifest-cp-24}
../lib/derbyrun.jar"/>
- <property name="manifest-cp-26" value="${manifest-cp-25}
../lib/derbytools.jar"/>
- <property name="manifest-cp-27" value="${manifest-cp-26}
../lib/jasper.jar"/>
+ <property name="manifest-cp-27" value="${manifest-cp-9}
../lib/jasper.jar"/>
<property name="manifest-cp-28" value="${manifest-cp-27}
../lib/jasper-el.jar"/>
<property name="manifest-cp-30" value="${manifest-cp-28}
../lib/jetty-server.jar"/>
<property name="manifest-cp-31" value="${manifest-cp-30}
../lib/jetty-util.jar"/>
@@ -1415,8 +1371,7 @@
<property name="manifest-cp-45" value="${manifest-cp-44}
../lib/xalan.jar"/>
<property name="manifest-cp-46" value="${manifest-cp-45}
../lib/xercesImpl.jar"/>
<property name="manifest-cp-47" value="${manifest-cp-46}
../lib/xml-apis.jar"/>
- <property name="manifest-cp-48" value="${manifest-cp-47}
../lib/derbynet.jar"/>
- <property name="manifest-cp-49" value="${manifest-cp-48}
../lib/ecj.jar"/>
+ <property name="manifest-cp-49" value="${manifest-cp-47}
../lib/ecj.jar"/>
<property name="manifest-cp-50" value="${manifest-cp-49}
../lib/jetty-webapp.jar"/>
<property name="manifest-cp-51" value="${manifest-cp-50}
../lib/jetty-servlet.jar"/>
<property name="manifest-cp-52" value="${manifest-cp-51}
../lib/velocity.jar"/>
@@ -1483,24 +1438,7 @@
<property name="manifest-cp-proprietary-7"
value="${manifest-cp-proprietary-5} ../lib/commons-io.jar"/>
<property name="manifest-cp-proprietary-8"
value="${manifest-cp-proprietary-7} ../lib/commons-logging.jar"/>
<property name="manifest-cp-proprietary-9"
value="${manifest-cp-proprietary-8} ../lib/hsqldb.jar"/>
- <property name="manifest-cp-proprietary-10"
value="${manifest-cp-proprietary-9} ../lib/derbyclient.jar"/>
- <property name="manifest-cp-proprietary-11"
value="${manifest-cp-proprietary-10} ../lib/derby.jar"/>
- <property name="manifest-cp-proprietary-12"
value="${manifest-cp-proprietary-11} ../lib/derbyLocale_cs.jar"/>
- <property name="manifest-cp-proprietary-13"
value="${manifest-cp-proprietary-12} ../lib/derbyLocale_de_DE.jar"/>
- <property name="manifest-cp-proprietary-14"
value="${manifest-cp-proprietary-13} ../lib/derbyLocale_es.jar"/>
- <property name="manifest-cp-proprietary-15"
value="${manifest-cp-proprietary-14} ../lib/derbyLocale_fr.jar"/>
- <property name="manifest-cp-proprietary-16"
value="${manifest-cp-proprietary-15} ../lib/derbyLocale_hu.jar"/>
- <property name="manifest-cp-proprietary-17"
value="${manifest-cp-proprietary-16} ../lib/derbyLocale_it.jar"/>
- <property name="manifest-cp-proprietary-18"
value="${manifest-cp-proprietary-17} ../lib/derbyLocale_ja_JP"/>
- <property name="manifest-cp-proprietary-19"
value="${manifest-cp-proprietary-18} ../lib/derbyLocale_ko_KR.jar"/>
- <property name="manifest-cp-proprietary-20"
value="${manifest-cp-proprietary-19} ../lib/derbyLocale_pl.jar"/>
- <property name="manifest-cp-proprietary-21"
value="${manifest-cp-proprietary-20} ../lib/derbyLocale_pt_BR.jar"/>
- <property name="manifest-cp-proprietary-22"
value="${manifest-cp-proprietary-21} ../lib/derbyLocale_ru.jar"/>
- <property name="manifest-cp-proprietary-23"
value="${manifest-cp-proprietary-22} ../lib/derbyLocale_zh_CN.jar"/>
- <property name="manifest-cp-proprietary-24"
value="${manifest-cp-proprietary-23} ../lib/derbyLocale_zh_TW.jar"/>
- <property name="manifest-cp-proprietary-25"
value="${manifest-cp-proprietary-24} ../lib/derbyrun.jar"/>
- <property name="manifest-cp-proprietary-26"
value="${manifest-cp-proprietary-25} ../lib/derbytools.jar"/>
- <property name="manifest-cp-proprietary-27"
value="${manifest-cp-proprietary-26} ../lib/jasper.jar"/>
+ <property name="manifest-cp-proprietary-27"
value="${manifest-cp-proprietary-9} ../lib/jasper.jar"/>
<property name="manifest-cp-proprietary-28"
value="${manifest-cp-proprietary-27} ../lib/jasper-el.jar"/>
<property name="manifest-cp-proprietary-30"
value="${manifest-cp-proprietary-28} ../lib/jetty-server.jar"/>
<property name="manifest-cp-proprietary-31"
value="${manifest-cp-proprietary-30} ../lib/jetty-util.jar"/>
@@ -1520,8 +1458,7 @@
<property name="manifest-cp-proprietary-45"
value="${manifest-cp-proprietary-44} ../lib/xalan.jar"/>
<property name="manifest-cp-proprietary-46"
value="${manifest-cp-proprietary-45} ../lib/xercesImpl.jar"/>
<property name="manifest-cp-proprietary-47"
value="${manifest-cp-proprietary-46} ../lib/xml-apis.jar"/>
- <property name="manifest-cp-proprietary-48"
value="${manifest-cp-proprietary-47} ../lib/derbynet.jar"/>
- <property name="manifest-cp-proprietary-49"
value="${manifest-cp-proprietary-48} ../lib/ecj.jar"/>
+ <property name="manifest-cp-proprietary-49"
value="${manifest-cp-proprietary-47} ../lib/ecj.jar"/>
<property name="manifest-cp-proprietary-50"
value="${manifest-cp-proprietary-49} ../lib-proprietary/ojdbc.jar"/>
<property name="manifest-cp-proprietary-51"
value="${manifest-cp-proprietary-50} ../lib-proprietary/jtds.jar"/>
<property name="manifest-cp-proprietary-52"
value="${manifest-cp-proprietary-51} ../lib/velocity.jar"/>
@@ -1727,29 +1664,6 @@
<target name="run-tests"
depends="compile-tests,run-core-tests,run-pull-agent-tests,run-script-engine-tests"/>
- <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>
- <path refid="framework-classpath"/>
- <pathelement location="build/core/classes"/>
- <pathelement location="build/ui-core/classes"/>
- <pathelement location="build/agents/classes"/>
- <pathelement location="build/pull-agent/classes"/>
- <pathelement location="build/authority-servlet/classes"/>
- <pathelement location="build/api-servlet/classes"/>
- <pathelement location="build/core-tests/classes"/>
- <pathelement location="build/agents-tests/classes"/>
- <pathelement location="build/pull-agent-tests/classes"/>
- </classpath>
- <formatter type="brief" usefile="false"/>
-
- <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-postgresql-output"/>
<junit fork="true" maxmemory="128m" dir="test-postgresql-output"
outputtoformatters="true" showoutput="true" haltonfailure="true">
@@ -1813,8 +1727,10 @@
</classpath>
<formatter type="brief" usefile="false"/>
+ <test name="org.apache.manifoldcf.core.throttler.TestThrottler"
todir="test-HSQLDB-output"/>
<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>
@@ -1854,6 +1770,6 @@
<target name="build"
depends="multi-process-zk-example,multi-process-zk-example-proprietary,multi-process-file-example,multi-process-file-example-proprietary,single-process-example,single-process-example-proprietary,example-common,script-engine,buildfiles,test-lib"/>
- <target name="all"
depends="build,doc,build-tests,run-tests,run-tests-derby,run-tests-HSQLDB,run-tests-HSQLDBext"/>
+ <target name="all"
depends="build,doc,build-tests,run-tests,run-tests-HSQLDB,run-tests-HSQLDBext"/>
</project>
Modified:
manifoldcf/branches/CONNECTORS-1044/framework/buildfiles/connector-build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1044/framework/buildfiles/connector-build.xml?rev=1627170&r1=1627169&r2=1627170&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1044/framework/buildfiles/connector-build.xml
(original)
+++
manifoldcf/branches/CONNECTORS-1044/framework/buildfiles/connector-build.xml
Tue Sep 23 22:36:05 2014
@@ -98,7 +98,6 @@
<target name="clean">
<delete dir="build"/>
<delete dir="dist"/>
- <delete dir="test-derby-output"/>
<delete dir="test-postgresql-output"/>
<delete dir="test-mysql-output"/>
<delete dir="test-HSQLDB-output"/>
@@ -169,7 +168,6 @@
<fileset dir="${mcf-dist}/test-lib"/>
<fileset dir="${mcf-dist}/lib">
<include name="postgresql*.jar"/>
- <include name="derby*.jar"/>
<include name="hsqldb*.jar"/>
</fileset>
<fileset dir="${mcf-dist}/lib-proprietary">
@@ -874,29 +872,6 @@
<target name="build-tests" depends="build,compile-tests"/>
- <target name="run-IT-derby" depends="compile-tests,pretest-check"
if="canTest">
- <mkdir dir="test-derby-output"/>
- <junit fork="true" maxmemory="128m" dir="test-derby-output"
outputtoformatters="true" showoutput="true" haltonfailure="true">
- <jvmarg
value="-DcrawlerWarPath=${mcf-dist}/web/war/mcf-crawler-ui.war"/>
- <jvmarg
value="-DauthorityserviceWarPath=${mcf-dist}/web/war/mcf-authority-service.war"/>
- <jvmarg
value="-DapiWarPath=${mcf-dist}/web/war/mcf-api-service.war"/>
- <jvmarg
value="-DcombinedWarPath=${mcf-dist}/web/war/mcf-combined-service.war"/>
- <classpath>
- <fileset dir="${env.JAVA_HOME}/lib">
- <include name="tools.jar"/>
- </fileset>
- <path refid="connector-test-classpath"/>
- <pathelement location="build/connector-tests/classes"/>
- </classpath>
- <formatter type="brief" usefile="false"/>
- <batchtest todir="test-derby-output">
- <fileset dir="build/connector-tests/classes">
- <include name="**/*DerbyIT.class"/>
- </fileset>
- </batchtest>
- </junit>
- </target>
-
<target name="run-IT-postgresql" depends="compile-tests,pretest-check"
if="canTest">
<mkdir dir="test-postgresql-output"/>
<junit fork="true" maxmemory="128m" dir="test-postgresql-output"
outputtoformatters="true" showoutput="true" haltonfailure="true">
@@ -989,29 +964,6 @@
</junit>
</target>
- <target name="run-LT-derby" depends="compile-tests,pretest-check"
if="canTest">
- <mkdir dir="test-derby-output"/>
- <junit fork="true" maxmemory="384m" dir="test-derby-output"
outputtoformatters="true" showoutput="true" haltonfailure="true">
- <jvmarg
value="-DcrawlerWarPath=${mcf-dist}/web/war/mcf-crawler-ui.war"/>
- <jvmarg
value="-DauthorityserviceWarPath=${mcf-dist}/web/war/mcf-authority-service.war"/>
- <jvmarg
value="-DapiWarPath=${mcf-dist}/web/war/mcf-api-service.war"/>
- <jvmarg
value="-DcombinedWarPath=${mcf-dist}/web/war/mcf-combined-service.war"/>
- <classpath>
- <fileset dir="${env.JAVA_HOME}/lib">
- <include name="tools.jar"/>
- </fileset>
- <path refid="connector-test-classpath"/>
- <pathelement location="build/connector-tests/classes"/>
- </classpath>
- <formatter type="brief" usefile="false"/>
- <batchtest todir="test-derby-output">
- <fileset dir="build/connector-tests/classes">
- <include name="**/*DerbyLT.class"/>
- </fileset>
- </batchtest>
- </junit>
- </target>
-
<target name="run-LT-postgresql" depends="compile-tests,pretest-check"
if="canTest">
<mkdir dir="test-postgresql-output"/>
<junit fork="true" maxmemory="384m" dir="test-postgresql-output"
outputtoformatters="true" showoutput="true" haltonfailure="true">
@@ -1104,29 +1056,6 @@
</junit>
</target>
- <target name="run-UI-derby" depends="compile-tests,pretest-check"
if="canTest">
- <mkdir dir="test-derby-output"/>
- <junit fork="true" maxmemory="128m" dir="test-derby-output"
outputtoformatters="true" showoutput="true" haltonfailure="true">
- <jvmarg
value="-DcrawlerWarPath=${mcf-dist}/web/war/mcf-crawler-ui.war"/>
- <jvmarg
value="-DauthorityserviceWarPath=${mcf-dist}/web/war/mcf-authority-service.war"/>
- <jvmarg
value="-DapiWarPath=${mcf-dist}/web/war/mcf-api-service.war"/>
- <jvmarg
value="-DcombinedWarPath=${mcf-dist}/web/war/mcf-combined-service.war"/>
- <classpath>
- <fileset dir="${env.JAVA_HOME}/lib">
- <include name="tools.jar"/>
- </fileset>
- <path refid="connector-test-classpath"/>
- <pathelement location="build/connector-tests/classes"/>
- </classpath>
- <formatter type="brief" usefile="false"/>
- <batchtest todir="test-derby-output">
- <fileset dir="build/connector-tests/classes">
- <include name="**/*DerbyUI.class"/>
- </fileset>
- </batchtest>
- </junit>
- </target>
-
<target name="run-UI-postgresql" depends="compile-tests,pretest-check"
if="canTest">
<mkdir dir="test-postgresql-output"/>
<junit fork="true" maxmemory="128m" dir="test-postgresql-output"
outputtoformatters="true" showoutput="true" haltonfailure="true">
@@ -1230,7 +1159,6 @@
<batchtest todir="test-output">
<fileset dir="build/connector-tests/classes">
<include name="**/*Test.class"/>
- <exclude name="**/*DerbyTest.class"/>
<exclude name="**/*PostgresqlTest.class"/>
<exclude name="**/*MySQLTest.class"/>
<exclude name="**/*HSQLDBTest.class"/>
@@ -1240,22 +1168,6 @@
</junit>
</target>
- <target name="run-tests-derby" depends="compile-tests,has-tests-check"
if="hasTests">
- <mkdir dir="test-derby-output"/>
- <junit fork="true" maxmemory="128m" dir="test-derby-output"
outputtoformatters="true" showoutput="true" haltonfailure="true">
- <classpath>
- <path refid="connector-test-classpath"/>
- <pathelement location="build/connector-tests/classes"/>
- </classpath>
- <formatter type="brief" usefile="false"/>
- <batchtest todir="test-derby-output">
- <fileset dir="build/connector-tests/classes">
- <include name="**/*DerbyTest.class"/>
- </fileset>
- </batchtest>
- </junit>
- </target>
-
<target name="run-tests-postgresql"
depends="compile-tests,has-tests-check" if="hasTests">
<mkdir dir="test-postgresql-output"/>
<junit fork="true" maxmemory="128m" dir="test-postgresql-output"
showoutput="true" haltonfailure="true">
@@ -1316,6 +1228,6 @@
</junit>
</target>
- <target name="all"
depends="build,doc,build-tests,run-tests,run-tests-derby,run-tests-HSQLDB"/>
+ <target name="all"
depends="build,doc,build-tests,run-tests,run-tests-HSQLDB"/>
</project>
Modified: manifoldcf/branches/CONNECTORS-1044/framework/combined-service/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1044/framework/combined-service/pom.xml?rev=1627170&r1=1627169&r2=1627170&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1044/framework/combined-service/pom.xml
(original)
+++ manifoldcf/branches/CONNECTORS-1044/framework/combined-service/pom.xml Tue
Sep 23 22:36:05 2014
@@ -92,102 +92,6 @@
<!-- database dependencies -->
<dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>${derby.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbytools</artifactId>
- <version>${derby.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbynet</artifactId>
- <version>${derby.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbyLocale_it</artifactId>
- <version>${derby.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbyLocale_de_DE</artifactId>
- <version>${derby.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbyLocale_es</artifactId>
- <version>${derby.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbyLocale_ja_JP</artifactId>
- <version>${derby.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbyLocale_cs</artifactId>
- <version>${derby.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbyLocale_zh_TW</artifactId>
- <version>${derby.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbyLocale_zh_CN</artifactId>
- <version>${derby.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbyLocale_pt_BR</artifactId>
- <version>${derby.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbyLocale_fr</artifactId>
- <version>${derby.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbyLocale_ru</artifactId>
- <version>${derby.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbyLocale_ko_KR</artifactId>
- <version>${derby.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbyLocale_hu</artifactId>
- <version>${derby.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbyLocale_pl</artifactId>
- <version>${derby.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>${hsqldb.version}</version>
Modified: manifoldcf/branches/CONNECTORS-1044/framework/core/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1044/framework/core/pom.xml?rev=1627170&r1=1627169&r2=1627170&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1044/framework/core/pom.xml (original)
+++ manifoldcf/branches/CONNECTORS-1044/framework/core/pom.xml Tue Sep 23
22:36:05 2014
@@ -252,12 +252,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>${derby.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>${slf4j.version}</version>
Modified:
manifoldcf/branches/CONNECTORS-1044/framework/core/src/test/java/org/apache/manifoldcf/core/throttler/TestThrottler.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1044/framework/core/src/test/java/org/apache/manifoldcf/core/throttler/TestThrottler.java?rev=1627170&r1=1627169&r2=1627170&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1044/framework/core/src/test/java/org/apache/manifoldcf/core/throttler/TestThrottler.java
(original)
+++
manifoldcf/branches/CONNECTORS-1044/framework/core/src/test/java/org/apache/manifoldcf/core/throttler/TestThrottler.java
Tue Sep 23 22:36:05 2014
@@ -25,7 +25,7 @@ import java.util.concurrent.atomic.*;
import org.junit.*;
import static org.junit.Assert.*;
-public class TestThrottler extends org.apache.manifoldcf.core.tests.BaseDerby
+public class TestThrottler extends org.apache.manifoldcf.core.tests.BaseHSQLDB
{
@Test
public void multiThreadConnectionPoolTest()
Modified: manifoldcf/branches/CONNECTORS-1044/framework/crawler-ui/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1044/framework/crawler-ui/pom.xml?rev=1627170&r1=1627169&r2=1627170&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1044/framework/crawler-ui/pom.xml (original)
+++ manifoldcf/branches/CONNECTORS-1044/framework/crawler-ui/pom.xml Tue Sep 23
22:36:05 2014
@@ -93,102 +93,6 @@
<!-- database dependencies -->
<dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>${derby.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbytools</artifactId>
- <version>${derby.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbynet</artifactId>
- <version>${derby.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbyLocale_it</artifactId>
- <version>${derby.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbyLocale_de_DE</artifactId>
- <version>${derby.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbyLocale_es</artifactId>
- <version>${derby.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbyLocale_ja_JP</artifactId>
- <version>${derby.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbyLocale_cs</artifactId>
- <version>${derby.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbyLocale_zh_TW</artifactId>
- <version>${derby.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbyLocale_zh_CN</artifactId>
- <version>${derby.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbyLocale_pt_BR</artifactId>
- <version>${derby.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbyLocale_fr</artifactId>
- <version>${derby.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbyLocale_ru</artifactId>
- <version>${derby.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbyLocale_ko_KR</artifactId>
- <version>${derby.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbyLocale_hu</artifactId>
- <version>${derby.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbyLocale_pl</artifactId>
- <version>${derby.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>${hsqldb.version}</version>
Modified:
manifoldcf/branches/CONNECTORS-1044/framework/example-singleprocess/properties.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1044/framework/example-singleprocess/properties.xml?rev=1627170&r1=1627169&r2=1627170&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1044/framework/example-singleprocess/properties.xml
(original)
+++
manifoldcf/branches/CONNECTORS-1044/framework/example-singleprocess/properties.xml
Tue Sep 23 22:36:05 2014
@@ -25,9 +25,9 @@
<property name="org.apache.manifoldcf.jettyport" value="8345"/>
<!-- Point to the combined war in case we start the single-process example
that way -->
<property name="org.apache.manifoldcf.combinedwarpath"
value="../web/war/mcf-combined-service.war"/>
- <!-- Select Derby as the database implementation, and specify where the
database will be stored -->
- <property name="org.apache.manifoldcf.databaseimplementationclass"
value="org.apache.manifoldcf.core.database.DBInterfaceDerby"/>
- <property name="org.apache.manifoldcf.derbydatabasepath" value="."/>
+ <!-- Select HSQLDB as the database implementation, and specify where the
database will be stored -->
+ <property name="org.apache.manifoldcf.databaseimplementationclass"
value="org.apache.manifoldcf.core.database.DBInterfaceHSQLDB"/>
+ <property name="org.apache.manifoldcf.hsqldbdatabasepath" value="."/>
<property name="org.apache.manifoldcf.database.maxhandles" value="100"/>
<property name="org.apache.manifoldcf.crawler.threads" value="50"/>
<property name="org.apache.manifoldcf.crawler.historycleanupinterval"
value="2592000000"/>
Modified: manifoldcf/branches/CONNECTORS-1044/framework/pull-agent/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1044/framework/pull-agent/pom.xml?rev=1627170&r1=1627169&r2=1627170&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1044/framework/pull-agent/pom.xml (original)
+++ manifoldcf/branches/CONNECTORS-1044/framework/pull-agent/pom.xml Tue Sep 23
22:36:05 2014
@@ -189,11 +189,5 @@
<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>
</dependencies>
</project>
\ No newline at end of file
Modified: manifoldcf/branches/CONNECTORS-1044/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1044/pom.xml?rev=1627170&r1=1627169&r2=1627170&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1044/pom.xml (original)
+++ manifoldcf/branches/CONNECTORS-1044/pom.xml Tue Sep 23 22:36:05 2014
@@ -41,7 +41,6 @@
<postgresql.version>9.1-901.jdbc4</postgresql.version>
<mysql.version>5.1.18</mysql.version>
<hsqldb.version>2.3.1</hsqldb.version>
- <derby.version>10.10.2.0</derby.version>
<jetty.version>7.5.4.v20111024</jetty.version>
<mail.version>1.4.5</mail.version>
<activation.version>1.1.1</activation.version>
