Commit c6cd7a4c authored by Marco Descher's avatar Marco Descher

wip

parent 1682fd57
Pipeline #4233 passed with stages
in 1 minute and 56 seconds
......@@ -16,6 +16,7 @@ Bundle-Vendor: info.elexis
Bundle-Activator: info.elexis.server.openid.internal.Activator
Import-Package: javax.servlet;version="2.4.0",
org.eclipse.core.runtime;version="3.5.0",
org.eclipse.jetty.osgi.boot;version="9.3.9",
org.eclipse.jetty.util.component;version="9.3.9",
org.osgi.framework;version="1.8.0",
org.osgi.service.component.annotations;version="1.2.0"
......
......@@ -7,6 +7,7 @@ import java.util.Hashtable;
import javax.sql.DataSource;
import org.eclipse.core.runtime.FileLocator;
import org.eclipse.jetty.osgi.boot.OSGiServerConstants;
import org.eclipse.jetty.server.handler.ContextHandler;
import org.eclipse.jetty.webapp.WebAppContext;
import org.osgi.service.component.annotations.Activate;
......@@ -33,7 +34,7 @@ public class WebappStarter {
String warFile =FileLocator.toFileURL(Activator.getContext().getBundle().getEntry("lib/openid.war")).getPath();
props.put("war", warFile);
props.put("contextPath", "/openid");
props.put("managedServerName", "defaultJettyServer");
props.put(OSGiServerConstants.MANAGED_JETTY_SERVER_NAME, OSGiServerConstants.MANAGED_JETTY_SERVER_DEFAULT_NAME);
Activator.getContext().registerService(ContextHandler.class.getName(), webapp, props);
}
......
......@@ -63,7 +63,7 @@
<plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
<plugin id="org.eclipse.gemini.jpa" autoStart="true" startLevel="2" />
<plugin id="org.eclipse.gemini.naming" autoStart="true" startLevel="1" />
<plugin id="org.eclipse.jetty.osgi.boot" autoStart="true" startLevel="0" />
<plugin id="org.eclipse.jetty.osgi.boot" autoStart="true" startLevel="3" />
<plugin id="org.eclipse.jetty.osgi.httpservice" autoStart="true" startLevel="0" />
<plugin id="org.eclipse.osgi" autoStart="false" startLevel="0" />
</configurations>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment