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 2014/10/01 15:24:14 UTC
svn commit: r1628699 - in
/manifoldcf/trunk/framework/jetty-runner/src/main/java/org/apache/manifoldcf/jettyrunner:
ManifoldCFCombinedJettyRunner.java ManifoldCFJettyRunner.java
Author: kwright
Date: Wed Oct 1 13:24:14 2014
New Revision: 1628699
URL: http://svn.apache.org/r1628699
Log:
Added jetty config file constructor for jetty runner classes. Part of CONNECTORS-345.
Modified:
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/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=1628699&r1=1628698&r2=1628699&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 Wed Oct 1 13:24:14 2014
@@ -32,6 +32,8 @@ import javax.servlet.http.HttpServletRes
import org.eclipse.jetty.server.handler.ContextHandlerCollection;
import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.util.resource.Resource;
+import org.eclipse.jetty.xml.XmlConfiguration;
import org.eclipse.jetty.webapp.WebAppContext;
import org.eclipse.jetty.server.Connector;
@@ -49,9 +51,24 @@ public class ManifoldCFCombinedJettyRunn
protected Server server;
+
+ public ManifoldCFCombinedJettyRunner( File configFile, String combinedWarPath )
+ throws Exception
+ {
+ Resource fileserverXml = Resource.newSystemResource(configFile.toString());
+ XmlConfiguration configuration = new XmlConfiguration(fileserverXml.getInputStream());
+ server = (Server)configuration.configure();
+ initializeServer( combinedWarPath );
+ }
+
public ManifoldCFCombinedJettyRunner( int port, String combinedWarPath )
{
- server = new Server( port );
+ server = new Server( port );
+ initializeServer( combinedWarPath );
+ }
+
+ protected void initializeServer( String combinedWarPath )
+ {
server.setStopAtShutdown( true );
// Initialize the servlets
@@ -61,7 +78,7 @@ public class ManifoldCFCombinedJettyRunn
mcfCombined.setParentLoaderPriority(false);
contexts.addHandler(mcfCombined);
}
-
+
public void start()
throws ManifoldCFException
{
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=1628699&r1=1628698&r2=1628699&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 Wed Oct 1 13:24:14 2014
@@ -33,6 +33,8 @@ import javax.servlet.http.HttpServletRes
import org.eclipse.jetty.server.handler.ContextHandlerCollection;
import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.util.resource.Resource;
+import org.eclipse.jetty.xml.XmlConfiguration;
import org.eclipse.jetty.webapp.WebAppContext;
import org.eclipse.jetty.server.Connector;
@@ -53,9 +55,23 @@ public class ManifoldCFJettyRunner
protected Server server;
+ public ManifoldCFJettyRunner( File configFile, String crawlerWarPath, String authorityServiceWarPath, String apiWarPath, boolean useParentLoader )
+ throws Exception
+ {
+ Resource fileserverXml = Resource.newSystemResource(configFile.toString());
+ XmlConfiguration configuration = new XmlConfiguration(fileserverXml.getInputStream());
+ server = (Server)configuration.configure();
+ initializeServer(crawlerWarPath, authorityServiceWarPath, apiWarPath, useParentLoader);
+ }
+
public ManifoldCFJettyRunner( int port, String crawlerWarPath, String authorityServiceWarPath, String apiWarPath, boolean useParentLoader )
{
- server = new Server( port );
+ Server server = new Server( port );
+ initializeServer(crawlerWarPath, authorityServiceWarPath, apiWarPath, useParentLoader);
+ }
+
+ protected void initializeServer( String crawlerWarPath, String authorityServiceWarPath, String apiWarPath, boolean useParentLoader )
+ {
server.setStopAtShutdown( true );
// Initialize the servlets