You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2011/12/15 18:55:52 UTC
svn commit: r1214894 - in
/incubator/lcf/branches/release-0.4-incubating-branch: ./
loadtests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_loadtests/
loadtests/rss/src/test/java/org/apache/manifoldcf/rss_loadtests/
tests/alfresco/src/test/...
Author: kwright
Date: Thu Dec 15 17:55:51 2011
New Revision: 1214894
URL: http://svn.apache.org/viewvc?rev=1214894&view=rev
Log:
Pull up further CONNECTORS-313 test changes from trunk.
Modified:
incubator/lcf/branches/release-0.4-incubating-branch/ (props changed)
incubator/lcf/branches/release-0.4-incubating-branch/loadtests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_loadtests/BaseDerby.java
incubator/lcf/branches/release-0.4-incubating-branch/loadtests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_loadtests/BaseHSQLDB.java
incubator/lcf/branches/release-0.4-incubating-branch/loadtests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_loadtests/BasePostgresql.java
incubator/lcf/branches/release-0.4-incubating-branch/loadtests/rss/src/test/java/org/apache/manifoldcf/rss_loadtests/BaseDerby.java
incubator/lcf/branches/release-0.4-incubating-branch/loadtests/rss/src/test/java/org/apache/manifoldcf/rss_loadtests/BaseHSQLDB.java
incubator/lcf/branches/release-0.4-incubating-branch/loadtests/rss/src/test/java/org/apache/manifoldcf/rss_loadtests/BasePostgresql.java
incubator/lcf/branches/release-0.4-incubating-branch/tests/alfresco/src/test/java/org/apache/manifoldcf/alfresco_tests/Base.java
incubator/lcf/branches/release-0.4-incubating-branch/tests/cmis/src/test/java/org/apache/manifoldcf/cmis_tests/Base.java
incubator/lcf/branches/release-0.4-incubating-branch/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/Base.java
incubator/lcf/branches/release-0.4-incubating-branch/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/BaseHSQLDB.java
incubator/lcf/branches/release-0.4-incubating-branch/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/BasePostgresql.java
incubator/lcf/branches/release-0.4-incubating-branch/tests/wiki/src/test/java/org/apache/manifoldcf/wiki_tests/BaseDerby.java
Propchange: incubator/lcf/branches/release-0.4-incubating-branch/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 15 17:55:51 2011
@@ -14,4 +14,4 @@
/incubator/lcf/branches/CONNECTORS-290:1204836-1205502
/incubator/lcf/branches/CONNECTORS-313:1213173-1214848
/incubator/lcf/branches/CONNECTORS-32:1092556-1094216
-/incubator/lcf/trunk:1214045,1214707,1214850
+/incubator/lcf/trunk:1214045,1214707,1214850,1214893
Modified: incubator/lcf/branches/release-0.4-incubating-branch/loadtests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_loadtests/BaseDerby.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/release-0.4-incubating-branch/loadtests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_loadtests/BaseDerby.java?rev=1214894&r1=1214893&r2=1214894&view=diff
==============================================================================
--- incubator/lcf/branches/release-0.4-incubating-branch/loadtests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_loadtests/BaseDerby.java (original)
+++ incubator/lcf/branches/release-0.4-incubating-branch/loadtests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_loadtests/BaseDerby.java Thu Dec 15 17:55:51 2011
@@ -294,9 +294,9 @@ public class BaseDerby extends org.apach
server.setStopAtShutdown( true );
- String crawlerWarPath = "../../framework/dist/web/war/mcf-crawler-ui.war";
- String authorityserviceWarPath = "../../framework/dist/web/war/mcf-authority-service.war";
- String apiWarPath = "../../framework/dist/web/war/mcf-api-service.war";
+ String crawlerWarPath = "../../framework/build/war/mcf-crawler-ui.war";
+ String authorityserviceWarPath = "../../framework/build/war/mcf-authority-service.war";
+ String apiWarPath = "../../framework/build/war/mcf-api-service.war";
if (System.getProperty("crawlerWarPath") != null)
crawlerWarPath = System.getProperty("crawlerWarPath");
Modified: incubator/lcf/branches/release-0.4-incubating-branch/loadtests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_loadtests/BaseHSQLDB.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/release-0.4-incubating-branch/loadtests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_loadtests/BaseHSQLDB.java?rev=1214894&r1=1214893&r2=1214894&view=diff
==============================================================================
--- incubator/lcf/branches/release-0.4-incubating-branch/loadtests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_loadtests/BaseHSQLDB.java (original)
+++ incubator/lcf/branches/release-0.4-incubating-branch/loadtests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_loadtests/BaseHSQLDB.java Thu Dec 15 17:55:51 2011
@@ -294,9 +294,9 @@ public class BaseHSQLDB extends org.apac
server.setStopAtShutdown( true );
- String crawlerWarPath = "../../framework/dist/web/war/mcf-crawler-ui.war";
- String authorityserviceWarPath = "../../framework/dist/web/war/mcf-authority-service.war";
- String apiWarPath = "../../framework/dist/web/war/mcf-api-service.war";
+ String crawlerWarPath = "../../framework/build/war/mcf-crawler-ui.war";
+ String authorityserviceWarPath = "../../framework/build/war/mcf-authority-service.war";
+ String apiWarPath = "../../framework/build/war/mcf-api-service.war";
if (System.getProperty("crawlerWarPath") != null)
crawlerWarPath = System.getProperty("crawlerWarPath");
Modified: incubator/lcf/branches/release-0.4-incubating-branch/loadtests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_loadtests/BasePostgresql.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/release-0.4-incubating-branch/loadtests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_loadtests/BasePostgresql.java?rev=1214894&r1=1214893&r2=1214894&view=diff
==============================================================================
--- incubator/lcf/branches/release-0.4-incubating-branch/loadtests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_loadtests/BasePostgresql.java (original)
+++ incubator/lcf/branches/release-0.4-incubating-branch/loadtests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_loadtests/BasePostgresql.java Thu Dec 15 17:55:51 2011
@@ -294,9 +294,9 @@ public class BasePostgresql extends org.
server.setStopAtShutdown( true );
- String crawlerWarPath = "../../framework/dist/web/war/mcf-crawler-ui.war";
- String authorityserviceWarPath = "../../framework/dist/web/war/mcf-authority-service.war";
- String apiWarPath = "../../framework/dist/web/war/mcf-api-service.war";
+ String crawlerWarPath = "../../framework/build/war/mcf-crawler-ui.war";
+ String authorityserviceWarPath = "../../framework/build/war/mcf-authority-service.war";
+ String apiWarPath = "../../framework/build/war/mcf-api-service.war";
if (System.getProperty("crawlerWarPath") != null)
crawlerWarPath = System.getProperty("crawlerWarPath");
Modified: incubator/lcf/branches/release-0.4-incubating-branch/loadtests/rss/src/test/java/org/apache/manifoldcf/rss_loadtests/BaseDerby.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/release-0.4-incubating-branch/loadtests/rss/src/test/java/org/apache/manifoldcf/rss_loadtests/BaseDerby.java?rev=1214894&r1=1214893&r2=1214894&view=diff
==============================================================================
--- incubator/lcf/branches/release-0.4-incubating-branch/loadtests/rss/src/test/java/org/apache/manifoldcf/rss_loadtests/BaseDerby.java (original)
+++ incubator/lcf/branches/release-0.4-incubating-branch/loadtests/rss/src/test/java/org/apache/manifoldcf/rss_loadtests/BaseDerby.java Thu Dec 15 17:55:51 2011
@@ -232,9 +232,9 @@ public class BaseDerby extends org.apach
server.setStopAtShutdown( true );
- String crawlerWarPath = "../../framework/dist/web/war/mcf-crawler-ui.war";
- String authorityserviceWarPath = "../../framework/dist/web/war/mcf-authority-service.war";
- String apiWarPath = "../../framework/dist/web/war/mcf-api-service.war";
+ String crawlerWarPath = "../../framework/build/war/mcf-crawler-ui.war";
+ String authorityserviceWarPath = "../../framework/build/war/mcf-authority-service.war";
+ String apiWarPath = "../../framework/build/war/mcf-api-service.war";
if (System.getProperty("crawlerWarPath") != null)
crawlerWarPath = System.getProperty("crawlerWarPath");
Modified: incubator/lcf/branches/release-0.4-incubating-branch/loadtests/rss/src/test/java/org/apache/manifoldcf/rss_loadtests/BaseHSQLDB.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/release-0.4-incubating-branch/loadtests/rss/src/test/java/org/apache/manifoldcf/rss_loadtests/BaseHSQLDB.java?rev=1214894&r1=1214893&r2=1214894&view=diff
==============================================================================
--- incubator/lcf/branches/release-0.4-incubating-branch/loadtests/rss/src/test/java/org/apache/manifoldcf/rss_loadtests/BaseHSQLDB.java (original)
+++ incubator/lcf/branches/release-0.4-incubating-branch/loadtests/rss/src/test/java/org/apache/manifoldcf/rss_loadtests/BaseHSQLDB.java Thu Dec 15 17:55:51 2011
@@ -232,9 +232,9 @@ public class BaseHSQLDB extends org.apac
server.setStopAtShutdown( true );
- String crawlerWarPath = "../../framework/dist/web/war/mcf-crawler-ui.war";
- String authorityserviceWarPath = "../../framework/dist/web/war/mcf-authority-service.war";
- String apiWarPath = "../../framework/dist/web/war/mcf-api-service.war";
+ String crawlerWarPath = "../../framework/build/war/mcf-crawler-ui.war";
+ String authorityserviceWarPath = "../../framework/build/war/mcf-authority-service.war";
+ String apiWarPath = "../../framework/build/war/mcf-api-service.war";
if (System.getProperty("crawlerWarPath") != null)
crawlerWarPath = System.getProperty("crawlerWarPath");
Modified: incubator/lcf/branches/release-0.4-incubating-branch/loadtests/rss/src/test/java/org/apache/manifoldcf/rss_loadtests/BasePostgresql.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/release-0.4-incubating-branch/loadtests/rss/src/test/java/org/apache/manifoldcf/rss_loadtests/BasePostgresql.java?rev=1214894&r1=1214893&r2=1214894&view=diff
==============================================================================
--- incubator/lcf/branches/release-0.4-incubating-branch/loadtests/rss/src/test/java/org/apache/manifoldcf/rss_loadtests/BasePostgresql.java (original)
+++ incubator/lcf/branches/release-0.4-incubating-branch/loadtests/rss/src/test/java/org/apache/manifoldcf/rss_loadtests/BasePostgresql.java Thu Dec 15 17:55:51 2011
@@ -232,9 +232,9 @@ public class BasePostgresql extends org.
server.setStopAtShutdown( true );
- String crawlerWarPath = "../../framework/dist/web/war/mcf-crawler-ui.war";
- String authorityserviceWarPath = "../../framework/dist/web/war/mcf-authority-service.war";
- String apiWarPath = "../../framework/dist/web/war/mcf-api-service.war";
+ String crawlerWarPath = "../../framework/build/war/mcf-crawler-ui.war";
+ String authorityserviceWarPath = "../../framework/build/war/mcf-authority-service.war";
+ String apiWarPath = "../../framework/build/war/mcf-api-service.war";
if (System.getProperty("crawlerWarPath") != null)
crawlerWarPath = System.getProperty("crawlerWarPath");
Modified: incubator/lcf/branches/release-0.4-incubating-branch/tests/alfresco/src/test/java/org/apache/manifoldcf/alfresco_tests/Base.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/release-0.4-incubating-branch/tests/alfresco/src/test/java/org/apache/manifoldcf/alfresco_tests/Base.java?rev=1214894&r1=1214893&r2=1214894&view=diff
==============================================================================
--- incubator/lcf/branches/release-0.4-incubating-branch/tests/alfresco/src/test/java/org/apache/manifoldcf/alfresco_tests/Base.java (original)
+++ incubator/lcf/branches/release-0.4-incubating-branch/tests/alfresco/src/test/java/org/apache/manifoldcf/alfresco_tests/Base.java Thu Dec 15 17:55:51 2011
@@ -239,9 +239,9 @@ public class Base extends org.apache.man
server = new Server( testPort );
server.setStopAtShutdown( true );
- String crawlerWarPath = "../../framework/dist/web/war/mcf-crawler-ui.war";
- String authorityserviceWarPath = "../../framework/dist/web/war/mcf-authority-service.war";
- String apiWarPath = "../../framework/dist/web/war/mcf-api-service.war";
+ String crawlerWarPath = "../../framework/build/war/mcf-crawler-ui.war";
+ String authorityserviceWarPath = "../../framework/build/war/mcf-authority-service.war";
+ String apiWarPath = "../../framework/build/war/mcf-api-service.war";
if (System.getProperty("crawlerWarPath") != null)
crawlerWarPath = System.getProperty("crawlerWarPath");
Modified: incubator/lcf/branches/release-0.4-incubating-branch/tests/cmis/src/test/java/org/apache/manifoldcf/cmis_tests/Base.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/release-0.4-incubating-branch/tests/cmis/src/test/java/org/apache/manifoldcf/cmis_tests/Base.java?rev=1214894&r1=1214893&r2=1214894&view=diff
==============================================================================
--- incubator/lcf/branches/release-0.4-incubating-branch/tests/cmis/src/test/java/org/apache/manifoldcf/cmis_tests/Base.java (original)
+++ incubator/lcf/branches/release-0.4-incubating-branch/tests/cmis/src/test/java/org/apache/manifoldcf/cmis_tests/Base.java Thu Dec 15 17:55:51 2011
@@ -238,9 +238,9 @@ public class Base extends org.apache.man
server = new Server( testPort );
server.setStopAtShutdown( true );
- String crawlerWarPath = "../../framework/dist/web/war/mcf-crawler-ui.war";
- String authorityserviceWarPath = "../../framework/dist/web/war/mcf-authority-service.war";
- String apiWarPath = "../../framework/dist/web/war/mcf-api-service.war";
+ String crawlerWarPath = "../../framework/build/war/mcf-crawler-ui.war";
+ String authorityserviceWarPath = "../../framework/build/war/mcf-authority-service.war";
+ String apiWarPath = "../../framework/build/war/mcf-api-service.war";
if (System.getProperty("crawlerWarPath") != null)
crawlerWarPath = System.getProperty("crawlerWarPath");
Modified: incubator/lcf/branches/release-0.4-incubating-branch/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/Base.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/release-0.4-incubating-branch/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/Base.java?rev=1214894&r1=1214893&r2=1214894&view=diff
==============================================================================
--- incubator/lcf/branches/release-0.4-incubating-branch/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/Base.java (original)
+++ incubator/lcf/branches/release-0.4-incubating-branch/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/Base.java Thu Dec 15 17:55:51 2011
@@ -293,9 +293,9 @@ public class Base extends org.apache.man
server = new Server( testPort );
server.setStopAtShutdown( true );
- String crawlerWarPath = "../../framework/dist/web/war/mcf-crawler-ui.war";
- String authorityserviceWarPath = "../../framework/dist/web/war/mcf-authority-service.war";
- String apiWarPath = "../../framework/dist/web/war/mcf-api-service.war";
+ String crawlerWarPath = "../../framework/build/war/mcf-crawler-ui.war";
+ String authorityserviceWarPath = "../../framework/build/war/mcf-authority-service.war";
+ String apiWarPath = "../../framework/build/war/mcf-api-service.war";
if (System.getProperty("crawlerWarPath") != null)
crawlerWarPath = System.getProperty("crawlerWarPath");
Modified: incubator/lcf/branches/release-0.4-incubating-branch/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/BaseHSQLDB.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/release-0.4-incubating-branch/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/BaseHSQLDB.java?rev=1214894&r1=1214893&r2=1214894&view=diff
==============================================================================
--- incubator/lcf/branches/release-0.4-incubating-branch/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/BaseHSQLDB.java (original)
+++ incubator/lcf/branches/release-0.4-incubating-branch/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/BaseHSQLDB.java Thu Dec 15 17:55:51 2011
@@ -293,9 +293,9 @@ public class BaseHSQLDB extends org.apac
server = new Server( testPort );
server.setStopAtShutdown( true );
- String crawlerWarPath = "../../framework/dist/web/war/mcf-crawler-ui.war";
- String authorityserviceWarPath = "../../framework/dist/web/war/mcf-authority-service.war";
- String apiWarPath = "../../framework/dist/web/war/mcf-api-service.war";
+ String crawlerWarPath = "../../framework/build/war/mcf-crawler-ui.war";
+ String authorityserviceWarPath = "../../framework/build/war/mcf-authority-service.war";
+ String apiWarPath = "../../framework/build/war/mcf-api-service.war";
if (System.getProperty("crawlerWarPath") != null)
crawlerWarPath = System.getProperty("crawlerWarPath");
Modified: incubator/lcf/branches/release-0.4-incubating-branch/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/BasePostgresql.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/release-0.4-incubating-branch/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/BasePostgresql.java?rev=1214894&r1=1214893&r2=1214894&view=diff
==============================================================================
--- incubator/lcf/branches/release-0.4-incubating-branch/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/BasePostgresql.java (original)
+++ incubator/lcf/branches/release-0.4-incubating-branch/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/BasePostgresql.java Thu Dec 15 17:55:51 2011
@@ -294,9 +294,9 @@ public class BasePostgresql extends org.
server.setStopAtShutdown( true );
- String crawlerWarPath = "../../framework/dist/web/war/mcf-crawler-ui.war";
- String authorityserviceWarPath = "../../framework/dist/web/war/mcf-authority-service.war";
- String apiWarPath = "../../framework/dist/web/war/mcf-api-service.war";
+ String crawlerWarPath = "../../framework/build/war/mcf-crawler-ui.war";
+ String authorityserviceWarPath = "../../framework/build/war/mcf-authority-service.war";
+ String apiWarPath = "../../framework/build/war/mcf-api-service.war";
if (System.getProperty("crawlerWarPath") != null)
crawlerWarPath = System.getProperty("crawlerWarPath");
Modified: incubator/lcf/branches/release-0.4-incubating-branch/tests/wiki/src/test/java/org/apache/manifoldcf/wiki_tests/BaseDerby.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/release-0.4-incubating-branch/tests/wiki/src/test/java/org/apache/manifoldcf/wiki_tests/BaseDerby.java?rev=1214894&r1=1214893&r2=1214894&view=diff
==============================================================================
--- incubator/lcf/branches/release-0.4-incubating-branch/tests/wiki/src/test/java/org/apache/manifoldcf/wiki_tests/BaseDerby.java (original)
+++ incubator/lcf/branches/release-0.4-incubating-branch/tests/wiki/src/test/java/org/apache/manifoldcf/wiki_tests/BaseDerby.java Thu Dec 15 17:55:51 2011
@@ -250,9 +250,9 @@ public class BaseDerby extends org.apach
server = new Server( testPort );
server.setStopAtShutdown( true );
- String crawlerWarPath = "../../framework/dist/web/war/mcf-crawler-ui.war";
- String authorityserviceWarPath = "../../framework/dist/web/war/mcf-authority-service.war";
- String apiWarPath = "../../framework/dist/web/war/mcf-api-service.war";
+ String crawlerWarPath = "../../framework/build/war/mcf-crawler-ui.war";
+ String authorityserviceWarPath = "../../framework/build/war/mcf-authority-service.war";
+ String apiWarPath = "../../framework/build/war/mcf-api-service.war";
if (System.getProperty("crawlerWarPath") != null)
crawlerWarPath = System.getProperty("crawlerWarPath");