manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1628905 - in /manifoldcf/trunk/framework: example-multiprocess-file-proprietary/ example-multiprocess-file/ example-multiprocess-zk-proprietary/ example-multiprocess-zk/ example-singleprocess-proprietary/ example-singleprocess/ jetty-runne...
Date Thu, 02 Oct 2014 07:54:25 GMT
Author: kwright
Date: Thu Oct  2 07:54:24 2014
New Revision: 1628905

URL: http://svn.apache.org/r1628905
Log:
Make reference to jetty.xml explicit.  Part of CONNECTORS-345.

Modified:
    manifoldcf/trunk/framework/example-multiprocess-file-proprietary/properties.xml
    manifoldcf/trunk/framework/example-multiprocess-file/properties.xml
    manifoldcf/trunk/framework/example-multiprocess-zk-proprietary/properties.xml
    manifoldcf/trunk/framework/example-multiprocess-zk/properties.xml
    manifoldcf/trunk/framework/example-singleprocess-proprietary/properties.xml
    manifoldcf/trunk/framework/example-singleprocess/properties.xml
    manifoldcf/trunk/framework/jetty-runner/src/main/java/org/apache/manifoldcf/jettyrunner/ManifoldCFCombinedJettyRunner.java
    manifoldcf/trunk/framework/jetty-runner/src/main/java/org/apache/manifoldcf/jettyrunner/ManifoldCFJettyRunner.java

Modified: manifoldcf/trunk/framework/example-multiprocess-file-proprietary/properties.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/example-multiprocess-file-proprietary/properties.xml?rev=1628905&r1=1628904&r2=1628905&view=diff
==============================================================================
--- manifoldcf/trunk/framework/example-multiprocess-file-proprietary/properties.xml (original)
+++ manifoldcf/trunk/framework/example-multiprocess-file-proprietary/properties.xml Thu Oct
 2 07:54:24 2014
@@ -22,6 +22,7 @@
   <property name="org.apache.manifoldcf.authorityservicewarpath" value="../web-proprietary/war/mcf-authority-service.war"/>
   <property name="org.apache.manifoldcf.apiservicewarpath" value="../web-proprietary/war/mcf-api-service.war"/>
   <property name="org.apache.manifoldcf.usejettyparentclassloader" value="false"/>
+  <property name="org.apache.manifoldcf.jettyconfigfile" value="./jetty.xml"/>
   <!-- Point to the synchronization area -->
   <property name="org.apache.manifoldcf.synchdirectory" value="./syncharea"/>
   <!-- Select HSQLDB as the database implementation, and specify multiprocess access -->

Modified: manifoldcf/trunk/framework/example-multiprocess-file/properties.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/example-multiprocess-file/properties.xml?rev=1628905&r1=1628904&r2=1628905&view=diff
==============================================================================
--- manifoldcf/trunk/framework/example-multiprocess-file/properties.xml (original)
+++ manifoldcf/trunk/framework/example-multiprocess-file/properties.xml Thu Oct  2 07:54:24
2014
@@ -22,6 +22,7 @@
   <property name="org.apache.manifoldcf.authorityservicewarpath" value="../web/war/mcf-authority-service.war"/>
   <property name="org.apache.manifoldcf.apiservicewarpath" value="../web/war/mcf-api-service.war"/>
   <property name="org.apache.manifoldcf.usejettyparentclassloader" value="false"/>
+  <property name="org.apache.manifoldcf.jettyconfigfile" value="./jetty.xml"/>
   <!-- Point to the synchronization area -->
   <property name="org.apache.manifoldcf.synchdirectory" value="./syncharea"/>
   <!-- Select HSQLDB as the database implementation, and specify multiprocess access -->

Modified: manifoldcf/trunk/framework/example-multiprocess-zk-proprietary/properties.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/example-multiprocess-zk-proprietary/properties.xml?rev=1628905&r1=1628904&r2=1628905&view=diff
==============================================================================
--- manifoldcf/trunk/framework/example-multiprocess-zk-proprietary/properties.xml (original)
+++ manifoldcf/trunk/framework/example-multiprocess-zk-proprietary/properties.xml Thu Oct
 2 07:54:24 2014
@@ -24,6 +24,7 @@
   <property name="org.apache.manifoldcf.authorityservicewarpath" value="../web-proprietary/war/mcf-authority-service.war"/>
   <property name="org.apache.manifoldcf.apiservicewarpath" value="../web-proprietary/war/mcf-api-service.war"/>
   <property name="org.apache.manifoldcf.usejettyparentclassloader" value="false"/>
+  <property name="org.apache.manifoldcf.jettyconfigfile" value="./jetty.xml"/>
   <!-- ZooKeeper lock manager configuration -->
   <property name="org.apache.manifoldcf.lockmanagerclass" value="org.apache.manifoldcf.core.lockmanager.ZooKeeperLockManager"/>
   <property name="org.apache.manifoldcf.zookeeper.connectstring" value="localhost:8349"/>

Modified: manifoldcf/trunk/framework/example-multiprocess-zk/properties.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/example-multiprocess-zk/properties.xml?rev=1628905&r1=1628904&r2=1628905&view=diff
==============================================================================
--- manifoldcf/trunk/framework/example-multiprocess-zk/properties.xml (original)
+++ manifoldcf/trunk/framework/example-multiprocess-zk/properties.xml Thu Oct  2 07:54:24
2014
@@ -24,6 +24,7 @@
   <property name="org.apache.manifoldcf.authorityservicewarpath" value="../web/war/mcf-authority-service.war"/>
   <property name="org.apache.manifoldcf.apiservicewarpath" value="../web/war/mcf-api-service.war"/>
   <property name="org.apache.manifoldcf.usejettyparentclassloader" value="false"/>
+  <property name="org.apache.manifoldcf.jettyconfigfile" value="./jetty.xml"/>
   <!-- ZooKeeper lock manager configuration -->
   <property name="org.apache.manifoldcf.lockmanagerclass" value="org.apache.manifoldcf.core.lockmanager.ZooKeeperLockManager"/>
   <property name="org.apache.manifoldcf.zookeeper.connectstring" value="localhost:8349"/>

Modified: manifoldcf/trunk/framework/example-singleprocess-proprietary/properties.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/example-singleprocess-proprietary/properties.xml?rev=1628905&r1=1628904&r2=1628905&view=diff
==============================================================================
--- manifoldcf/trunk/framework/example-singleprocess-proprietary/properties.xml (original)
+++ manifoldcf/trunk/framework/example-singleprocess-proprietary/properties.xml Thu Oct  2
07:54:24 2014
@@ -22,6 +22,7 @@
   <property name="org.apache.manifoldcf.authorityservicewarpath" value="../web-proprietary/war/mcf-authority-service.war"/>
   <property name="org.apache.manifoldcf.apiservicewarpath" value="../web-proprietary/war/mcf-api-service.war"/>
   <property name="org.apache.manifoldcf.usejettyparentclassloader" value="true"/>
+  <property name="org.apache.manifoldcf.jettyconfigfile" value="./jetty.xml"/>
   <!-- Point to the combined war in case we start the single-process example that way
-->
   <property name="org.apache.manifoldcf.combinedwarpath" value="../web-proprietary/war/mcf-combined-service.war"/>
   <!-- Select Derby as the database implementation, and specify where the database will
be stored -->

Modified: manifoldcf/trunk/framework/example-singleprocess/properties.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/example-singleprocess/properties.xml?rev=1628905&r1=1628904&r2=1628905&view=diff
==============================================================================
--- manifoldcf/trunk/framework/example-singleprocess/properties.xml (original)
+++ manifoldcf/trunk/framework/example-singleprocess/properties.xml Thu Oct  2 07:54:24 2014
@@ -22,6 +22,7 @@
   <property name="org.apache.manifoldcf.authorityservicewarpath" value="../web/war/mcf-authority-service.war"/>
   <property name="org.apache.manifoldcf.apiservicewarpath" value="../web/war/mcf-api-service.war"/>
   <property name="org.apache.manifoldcf.usejettyparentclassloader" value="true"/>
+  <property name="org.apache.manifoldcf.jettyconfigfile" value="./jetty.xml"/>
   <!-- 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 HSQLDB as the database implementation, and specify where the database will
be stored -->

Modified: manifoldcf/trunk/framework/jetty-runner/src/main/java/org/apache/manifoldcf/jettyrunner/ManifoldCFCombinedJettyRunner.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/jetty-runner/src/main/java/org/apache/manifoldcf/jettyrunner/ManifoldCFCombinedJettyRunner.java?rev=1628905&r1=1628904&r2=1628905&view=diff
==============================================================================
--- manifoldcf/trunk/framework/jetty-runner/src/main/java/org/apache/manifoldcf/jettyrunner/ManifoldCFCombinedJettyRunner.java
(original)
+++ manifoldcf/trunk/framework/jetty-runner/src/main/java/org/apache/manifoldcf/jettyrunner/ManifoldCFCombinedJettyRunner.java
Thu Oct  2 07:54:24 2014
@@ -57,7 +57,7 @@ public class ManifoldCFCombinedJettyRunn
   public ManifoldCFCombinedJettyRunner( File configFile, String combinedWarPath )
     throws Exception
   {
-    Resource fileserverXml = Resource.newSystemResource(configFile.toString());
+    Resource fileserverXml = Resource.newResource(configFile.getCanonicalFile());
     XmlConfiguration configuration = new XmlConfiguration(fileserverXml.getInputStream());
     server = (Server)configuration.configure();
     initializeServer( combinedWarPath );

Modified: manifoldcf/trunk/framework/jetty-runner/src/main/java/org/apache/manifoldcf/jettyrunner/ManifoldCFJettyRunner.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/jetty-runner/src/main/java/org/apache/manifoldcf/jettyrunner/ManifoldCFJettyRunner.java?rev=1628905&r1=1628904&r2=1628905&view=diff
==============================================================================
--- manifoldcf/trunk/framework/jetty-runner/src/main/java/org/apache/manifoldcf/jettyrunner/ManifoldCFJettyRunner.java
(original)
+++ manifoldcf/trunk/framework/jetty-runner/src/main/java/org/apache/manifoldcf/jettyrunner/ManifoldCFJettyRunner.java
Thu Oct  2 07:54:24 2014
@@ -60,7 +60,7 @@ public class ManifoldCFJettyRunner
   public ManifoldCFJettyRunner( File configFile, String crawlerWarPath, String authorityServiceWarPath,
String apiWarPath, boolean useParentLoader )
     throws Exception
   {
-    Resource fileserverXml = Resource.newSystemResource(configFile.toString());
+    Resource fileserverXml = Resource.newResource(configFile.getCanonicalFile());
     XmlConfiguration configuration = new XmlConfiguration(fileserverXml.getInputStream());
     server = (Server)configuration.configure();
     initializeServer(crawlerWarPath, authorityServiceWarPath, apiWarPath, useParentLoader);
@@ -188,6 +188,7 @@ public class ManifoldCFJettyRunner
       File apiWarPath = ManifoldCF.getFileProperty(apiServiceWarPathProperty);
       boolean useParentClassLoader = ManifoldCF.getBooleanProperty(useJettyParentClassLoaderProperty,true);
       File jettyConfigFile = ManifoldCF.getFileProperty(jettyConfigFileProperty);
+
       if (jettyConfigFile == null)
         jettyConfigFile = new File("./jetty.xml");
       if (args.length == 4)



Mime
View raw message