Modified: manifoldcf/trunk/framework/build.xml URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/build.xml?rev=1627345&r1=1627344&r2=1627345&view=diff ============================================================================== --- manifoldcf/trunk/framework/build.xml (original) +++ manifoldcf/trunk/framework/build.xml Wed Sep 24 15:18:02 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/trunk/framework/buildfiles/connector-build.xml URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/buildfiles/connector-build.xml?rev=1627345&r1=1627344&r2=1627345&view=diff ============================================================================== --- manifoldcf/trunk/framework/buildfiles/connector-build.xml (original) +++ manifoldcf/trunk/framework/buildfiles/connector-build.xml Wed Sep 24 15:18:02 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/trunk/framework/combined-service/pom.xml URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/combined-service/pom.xml?rev=1627345&r1=1627344&r2=1627345&view=diff ============================================================================== --- manifoldcf/trunk/framework/combined-service/pom.xml (original) +++ manifoldcf/trunk/framework/combined-service/pom.xml Wed Sep 24 15:18:02 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/trunk/framework/core/pom.xml URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/core/pom.xml?rev=1627345&r1=1627344&r2=1627345&view=diff ============================================================================== --- manifoldcf/trunk/framework/core/pom.xml (original) +++ manifoldcf/trunk/framework/core/pom.xml Wed Sep 24 15:18:02 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/trunk/framework/core/src/test/java/org/apache/manifoldcf/core/throttler/TestThrottler.java URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/core/src/test/java/org/apache/manifoldcf/core/throttler/TestThrottler.java?rev=1627345&r1=1627344&r2=1627345&view=diff ============================================================================== --- manifoldcf/trunk/framework/core/src/test/java/org/apache/manifoldcf/core/throttler/TestThrottler.java (original) +++ manifoldcf/trunk/framework/core/src/test/java/org/apache/manifoldcf/core/throttler/TestThrottler.java Wed Sep 24 15:18:02 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/trunk/framework/crawler-ui/pom.xml URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/pom.xml?rev=1627345&r1=1627344&r2=1627345&view=diff ============================================================================== --- manifoldcf/trunk/framework/crawler-ui/pom.xml (original) +++ manifoldcf/trunk/framework/crawler-ui/pom.xml Wed Sep 24 15:18:02 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/trunk/framework/example-singleprocess/properties.xml URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/example-singleprocess/properties.xml?rev=1627345&r1=1627344&r2=1627345&view=diff ============================================================================== --- manifoldcf/trunk/framework/example-singleprocess/properties.xml (original) +++ manifoldcf/trunk/framework/example-singleprocess/properties.xml Wed Sep 24 15:18:02 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/trunk/framework/pull-agent/pom.xml URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/pull-agent/pom.xml?rev=1627345&r1=1627344&r2=1627345&view=diff ============================================================================== --- manifoldcf/trunk/framework/pull-agent/pom.xml (original) +++ manifoldcf/trunk/framework/pull-agent/pom.xml Wed Sep 24 15:18:02 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/trunk/pom.xml URL: http://svn.apache.org/viewvc/manifoldcf/trunk/pom.xml?rev=1627345&r1=1627344&r2=1627345&view=diff ============================================================================== --- manifoldcf/trunk/pom.xml (original) +++ manifoldcf/trunk/pom.xml Wed Sep 24 15:18:02 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>
