incubator-connectors-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1153951 - /incubator/lcf/branches/CONNECTORS-236/tests/cmis/src/test/java/org/apache/manifoldcf/cmis_tests/Base.java
Date Thu, 04 Aug 2011 17:42:39 GMT
Author: kwright
Date: Thu Aug  4 17:42:39 2011
New Revision: 1153951

URL: http://svn.apache.org/viewvc?rev=1153951&view=rev
Log:
Modify Base to use relative paths rather than fixed ones.

Modified:
    incubator/lcf/branches/CONNECTORS-236/tests/cmis/src/test/java/org/apache/manifoldcf/cmis_tests/Base.java

Modified: incubator/lcf/branches/CONNECTORS-236/tests/cmis/src/test/java/org/apache/manifoldcf/cmis_tests/Base.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-236/tests/cmis/src/test/java/org/apache/manifoldcf/cmis_tests/Base.java?rev=1153951&r1=1153950&r2=1153951&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-236/tests/cmis/src/test/java/org/apache/manifoldcf/cmis_tests/Base.java
(original)
+++ incubator/lcf/branches/CONNECTORS-236/tests/cmis/src/test/java/org/apache/manifoldcf/cmis_tests/Base.java
Thu Aug  4 17:42:39 2011
@@ -238,13 +238,9 @@ public class Base extends org.apache.man
     server = new Server( testPort );    
     server.setStopAtShutdown( true );
     
-    cmisServer = new Server(9090);
-    server.setStopAtShutdown(true);
-    
-    String crawlerWarPath = "/Users/piergiorgiolucidi/Documents/workspaces/manifold/mcf-trunk/tests/cmis/target/dependency/mcf-crawler-ui-0.3.0-SNAPSHOT.war";
-    String authorityserviceWarPath = "/Users/piergiorgiolucidi/Documents/workspaces/manifold/mcf-trunk/tests/cmis/target/dependency/mcf-authority-service-0.3.0-SNAPSHOT.war";
-    String apiWarPath = "/Users/piergiorgiolucidi/Documents/workspaces/manifold/mcf-trunk/tests/cmis/target/dependency/mcf-api-service-0.3.0-SNAPSHOT.war";
-    String openCmisServerWarPath = "/Users/piergiorgiolucidi/Documents/workspaces/manifold/mcf-trunk/tests/cmis/war/chemistry-opencmis-server-inmemory-war-0.5.0-SNAPSHOT.war";
+    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";
 
     if (System.getProperty("crawlerWarPath") != null)
     	crawlerWarPath = System.getProperty("crawlerWarPath");
@@ -252,9 +248,7 @@ public class Base extends org.apache.man
     	authorityserviceWarPath = System.getProperty("authorityserviceWarPath");
     if (System.getProperty("apiWarPath") != null)
     	apiWarPath = System.getProperty("apiWarPath");
-    if (System.getProperty("openCmisServerWarPath") != null)
-      openCmisServerWarPath = System.getProperty("openCmisServerWarPath");
-    
+
     // Initialize the servlets
     WebAppContext lcfCrawlerUI = new WebAppContext(crawlerWarPath,"/mcf-crawler-ui");
     // This will cause jetty to ignore all of the framework and jdbc jars in the war, which
is what we want.
@@ -267,16 +261,23 @@ public class Base extends org.apache.man
     WebAppContext lcfApi = new WebAppContext(apiWarPath,"/mcf-api-service");
     lcfApi.setParentLoaderPriority(true);
     server.addHandler(lcfApi);
+    server.start();
+
+    cmisServer = new Server(9090);
+    server.setStopAtShutdown(true);
+
+    String openCmisServerWarPath = "../../lib/chemistry-opencmis-server-inmemory-war-0.5.0-SNAPSHOT.war";
+
+    if (System.getProperty("openCmisServerWarPath") != null)
+      openCmisServerWarPath = System.getProperty("openCmisServerWarPath");
     
     //Initialize OpenCMIS Server bindings
     WebAppContext openCmisServerApi = new WebAppContext(openCmisServerWarPath,"/chemistry-opencmis-server-inmemory");
-    lcfApi.setParentLoaderPriority(true);
+    openCmisServerApi.setParentLoaderPriority(false);
     cmisServer.addHandler(openCmisServerApi);
     
     cmisServer.start();
-    server.start();
     
-
     // If all worked, then we can start the daemon.
     // Clear the agents shutdown signal.
     IThreadContext tc = ThreadContextFactory.make();



Mime
View raw message