Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-07-07 09:32:52 +02:00
Code Issues Packages Projects Releases Activity

using contextpath /scm for scm-server

Browse Source
This commit is contained in:
Sebastian Sdorra
2011-02-06 11:13:57 +01:00
parent 99bdb48ee8
commit f9e03103d4
2 changed files with 33 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
scm-server-jetty/src/main/java/sonia/scm/server/jetty/JettyServer.java
View File

@@ -35,7 +35,6 @@ package sonia.scm.server.jetty;
//~--- non-JDK imports --------------------------------------------------------
import org.eclipse.jetty.webapp.WebAppContext;
import org.eclipse.jetty.xml.XmlConfiguration;
import sonia.scm.server.Server;
@@ -126,12 +125,6 @@ public class JettyServer implements Server
server.addLifeCycleListener(new JettyServerListenerAdapter(listener));
}
WebAppContext wac = new WebAppContext();
wac.setWar(webapp.getAbsolutePath());
wac.setExtractWAR(true);
server.setHandler(wac);
// server.setStopAtShutdown(true);
server.start();
server.join();

33
scm-server/src/main/conf/server-config.xml
View File

@@ -27,6 +27,39 @@
</Arg>
</Call>
<New id="scm-webapp" class="org.eclipse.jetty.webapp.WebAppContext">
<Set name="contextPath">/scm</Set>
<Set name="war">webapp/scm-webapp.war</Set>
</New>
<New id="docroot" class="org.eclipse.jetty.webapp.WebAppContext">
<Set name="contextPath">/</Set>
<Set name="baseResource">
<New class="org.eclipse.jetty.util.resource.ResourceCollection">
<Arg>
<Array type="java.lang.String">
<Item>webapp/docroot</Item>
</Array>
</Arg>
</New>
</Set>
</New>
<Set name="handler">
<New class="org.eclipse.jetty.server.handler.HandlerCollection">
<Set name="handlers">
<Array type="org.eclipse.jetty.server.Handler">
<Item>
<Ref id="scm-webapp" />
</Item>
<Item>
<Ref id="docroot" />
</Item>
</Array>
</Set>
</New>
</Set>
<!-- mod_proxy_ajp or mod_jk -->
<!--
<Call name="addConnector">