eclipse-sailing-analytics/sailing-analytics
1
0
Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-09-20 04:35:32 +00:00
Code Activity

first version... the PDE build works against a target platform referencing local p2 repositories generated by a script file...

Browse Source
This commit is contained in:
fmittag
2011-12-06 16:42:25 +01:00
parent f3ff85d983
commit 956532b362
27 changed files with 159 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/com.google.gwt.osgi/META-INF/MANIFEST.MF
-10
View File
@@ -303,16 +303,6 @@ Export-Package: com.gargoylesoftware.htmlunit,
javax.validation.groups,
javax.validation.metadata,
javax.validation.spi,
javax.xml,
javax.xml.datatype,
javax.xml.namespace,
javax.xml.parsers,
javax.xml.transform,
javax.xml.transform.dom,
javax.xml.transform.sax,
javax.xml.transform.stream,
javax.xml.validation,
javax.xml.xpath,
mx4j,
mx4j.loading,
mx4j.log,
java/com.googlecode.java-diff-utils.test/META-INF/MANIFEST.MF
+2 -2
View File
@@ -5,7 +5,7 @@ Bundle-SymbolicName: com.googlecode.java-diff-utils.test
Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: GOOGLECODE
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Require-Bundle: com.googlecode.java-diff-utils;bundle-version="1.3.0",
org.junit4;bundle-version="4.8.1"
Require-Bundle: com.googlecode.java-diff-utils;bundle-version="1.3.0"
Bundle-ClassPath: test/,
.
Import-Package: junit.framework;version="4.8.1"
java/com.sap.sailing.declination.test/META-INF/MANIFEST.MF
+2 -2
View File
@@ -6,5 +6,5 @@ Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: SAP
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Require-Bundle: com.sap.sailing.declination,
com.sap.sailing.domain,
org.junit4;bundle-version="4.8.1"
com.sap.sailing.domain
Import-Package: org.junit;version="4.8.1"
java/com.sap.sailing.domain.swisstimingadapter.test/META-INF/MANIFEST.MF
+2 -2
View File
@@ -8,11 +8,11 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Require-Bundle: com.sap.sailing.domain.swisstimingadapter.persistence,
com.sap.sailing.domain.swisstimingadapter,
com.sap.sailing.domain,
org.junit4,
com.sap.sailing.udpconnector,
com.mongodb.driver;bundle-version="2.6.2",
com.sap.sailing.mongodb,
com.googlecode.java-diff-utils;bundle-version="1.3.0"
Bundle-ClassPath: resources/,
.
Import-Package: com.sap.sailing.server
Import-Package: com.sap.sailing.server,
org.junit;version="4.8.1"
java/com.sap.sailing.domain.test/META-INF/MANIFEST.MF
+1 -1
View File
@@ -7,9 +7,9 @@ Bundle-Vendor: SAP
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Require-Bundle: com.sap.sailing.domain,
com.tractrac.clientmodule,
org.junit4,
com.sap.sailing.domain.tractracadapter,
org.json.simple;bundle-version="1.1.0",
com.googlecode.java-diff-utils;bundle-version="1.3.0"
Export-Package: com.sap.sailing.domain.test,
com.sap.sailing.domain.test.mock
Import-Package: org.junit;version="4.8.1"
java/com.sap.sailing.expeditionconnector.test/META-INF/MANIFEST.MF
+3 -3
View File
@@ -5,11 +5,11 @@ Bundle-SymbolicName: com.sap.sailing.expeditionconnector.test
Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: SAP
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Require-Bundle: org.junit4;bundle-version="4.8.1",
com.sap.sailing.server,
Require-Bundle: com.sap.sailing.server,
com.sap.sailing.expeditionconnector,
com.sap.sailing.domain,
com.sap.sailing.declination,
com.sap.sailing.domain.test,
com.sap.sailing.udpconnector
Import-Package: org.osgi.framework;version="1.6.0"
Import-Package: org.osgi.framework;version="1.6.0",
org.junit;version="4.8.1"
java/com.sap.sailing.gwt.ui.test/META-INF/MANIFEST.MF
+3 -3
View File
@@ -10,8 +10,8 @@ Require-Bundle: com.sap.sailing.gwt.ui,
com.sap.sailing.domain,
org.json.simple,
com.sap.sailing.server,
com.google.gwt.osgi;bundle-version="2.4.0",
org.junit4
com.google.gwt.osgi;bundle-version="2.4.0"
Bundle-ClassPath: .
Import-Package: org.osgi.framework,
org.osgi.util.tracker;version="1.5.0"
org.osgi.util.tracker;version="1.5.0",
org.junit;version="4.8.1"
java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF
+8 -7
View File
@@ -12,11 +12,11 @@ Require-Bundle: com.sap.sailing.domain,
org.json.simple;bundle-version="1.1.0",
com.sap.sailing.mongodb,
com.mongodb.driver;bundle-version="2.6.2",
com.sap.ui.phoenix.pwt-sap.ui.commons,
com.sap.ui.phoenix.pwt-sap.ui.core,
com.sap.ui.phoenix.commons,
com.sap.ui.phoenix.core,
com.sap.sailing.httpservicetracker,
com.sap.ui5.commons,
com.sap.ui5.core,
com.sap.ui5.resource,
com.sap.ui5.gwt.commons,
com.sap.ui5.gwt.core,
com.sap.sailing.domain.swisstimingadapter,
com.sap.sailing.domain.persistence,
com.sap.sailing.domain.swisstimingadapter.persistence,
@@ -29,10 +29,11 @@ Bundle-ClassPath: lib/gwt-maps.jar,
Bundle-Activator: com.sap.sailing.gwt.ui.server.Activator
Bundle-ActivationPolicy: lazy
Export-Package: com.sap.sailing.gwt.ui.client;x-friends:="com.sap.sailing.gwt.ui.test",
com.sap.sailing.gwt.ui.server;x-friends:="com.sap.sailing.gwt.ui.test,com.sap.ui.phoenix.resource-osgi",
com.sap.sailing.gwt.ui.server;x-friends:="com.sap.sailing.gwt.ui.test",
com.sap.sailing.gwt.ui.shared;x-friends:="com.sap.sailing.gwt.ui.test"
Import-Package: org.osgi.framework,
org.osgi.util.tracker,
org.osgi.service.http,
javax.servlet,
javax.servlet.http
Web-ContextPath: /
Jetty-WarFolderPath: war
java/com.sap.sailing.gwt.ui/lib/pwt-sap.ui.commons-0.18.0-20110817.025846-27-javadoc.jar
BIN
View File
Binary file not shown.
java/com.sap.sailing.gwt.ui/lib/pwt-sap.ui.commons-0.18.0-20110817.025846-27.jar
BIN
View File
Binary file not shown.
java/com.sap.sailing.gwt.ui/lib/pwt-sap.ui.core-0.18.0-20110817.025846-27-javadoc.jar
BIN
View File
Binary file not shown.
java/com.sap.sailing.gwt.ui/lib/pwt-sap.ui.core-0.18.0-20110817.025846-27.jar
BIN
View File
Binary file not shown.
java/com.sap.sailing.gwt.ui/lib/pwt-sap.ui.table-0.18.0-20110817.025846-27-javadoc.jar
BIN
View File
Binary file not shown.
java/com.sap.sailing.gwt.ui/lib/pwt-sap.ui.table-0.18.0-20110817.025846-27.jar
BIN
View File
Binary file not shown.
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/Activator.java
+8 -9
View File
@@ -6,29 +6,28 @@ import java.util.Map;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
import com.sap.sailing.httpservicetracker.HttpServiceTracker;
public class Activator implements BundleActivator {
private static BundleContext context;
private HttpServiceTracker httpServiceTracker;
// private HttpServiceTracker httpServiceTracker;
@Override
public void start(BundleContext context) throws Exception {
Activator.context = context;
// now track the HTTP service:
Map<String, Class<? extends javax.servlet.Servlet>> pathMap = new HashMap<String, Class<? extends javax.servlet.Servlet>>();
pathMap.put("/sailing", SailingServiceImpl.class);
// pathMap.put("/sailing", SailingServiceImpl.class);
Map<String, String> resourceMap = new HashMap<String, String>();
resourceMap.put("/", "/war");
httpServiceTracker = new HttpServiceTracker(context, pathMap, resourceMap);
httpServiceTracker.open();
// resourceMap.put("/", "/war");
// httpServiceTracker = new HttpServiceTracker(context, pathMap, resourceMap);
// httpServiceTracker.open();
}
@Override
public void stop(BundleContext context) throws Exception {
// stop tracking the HTTP service:
httpServiceTracker.close();
httpServiceTracker = null;
// httpServiceTracker.close();
// httpServiceTracker = null;
}
public static BundleContext getDefault() {
java/com.sap.sailing.gwt.ui/war/WEB-INF/web.xml
+35 -7
View File
@@ -1,10 +1,38 @@
<?xml version="1.0" encoding="utf-8"?>
<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" version="2.5">
<!-- TODO: Add <servlet> tags for each servlet here. -->
<!-- TODO: Add <servlet-mapping> tags for each <servlet> here. -->
<!-- TODO: Optionally add a <welcome-file-list> tag to display a welcome file. -->
xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" version="2.5">
<servlet>
<display-name>Sailing Service</display-name>
<servlet-name>SailingService</servlet-name>
<servlet-class>com.sap.sailing.gwt.ui.server.SailingServiceImpl</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>SailingService</servlet-name>
<url-pattern>/sailing</url-pattern>
</servlet-mapping>
<servlet>
<display-name>ResourceServlet</display-name>
<servlet-name>ResourceServlet</servlet-name>
<servlet-class>com.sap.ui5.resource.ResourceServlet</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>ResourceServlet</servlet-name>
<url-pattern>/resources/*</url-pattern>
</servlet-mapping>
<!--
<servlet-mapping>
<servlet-name>ResourceServlet</servlet-name>
<url-pattern>/test-resources/*</url-pattern>
</servlet-mapping>
<context-param>
<param-name>com.sap.ui5.resource.DEV_MODE</param-name>
<param-value>false</param-value>
</context-param>
-->
</web-app>
java/com.sap.sailing.mongodb.test/.classpath
-1
View File
@@ -2,7 +2,6 @@
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="src" path="src/"/>
<classpathentry kind="output" path="bin"/>
</classpath>
java/com.sap.sailing.mongodb.test/META-INF/MANIFEST.MF
+2 -2
View File
@@ -5,8 +5,7 @@ Bundle-SymbolicName: com.sap.sailing.mongodb.test
Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: SAP
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Require-Bundle: org.junit4;bundle-version="4.8.1",
com.mongodb.driver;bundle-version="2.6.2",
Require-Bundle: com.mongodb.driver;bundle-version="2.6.2",
com.sap.sailing.domain,
com.sap.sailing.mongodb,
com.sap.sailing.domain.test,
@@ -15,3 +14,4 @@ Require-Bundle: org.junit4;bundle-version="4.8.1",
org.eclipse.osgi,
com.sap.sailing.domain.persistence,
com.sap.sailing.server
Import-Package: org.junit;version="4.8.1"
java/com.sap.sailing.server.test/META-INF/MANIFEST.MF
+2 -2
View File
@@ -7,5 +7,5 @@ Bundle-Vendor: SAP
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Require-Bundle: com.sap.sailing.server,
com.sap.sailing.domain,
com.sap.sailing.domain.tractracadapter,
org.junit4
com.sap.sailing.domain.tractracadapter
Import-Package: org.junit;version="4.8.1"
java/com.sap.sailing.server/META-INF/MANIFEST.MF
+6 -6
View File
@@ -6,11 +6,11 @@ Bundle-Version: 1.0.0.qualifier
Bundle-Activator: com.sap.sailing.server.Activator
Bundle-Vendor: SAP
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.osgi.framework;version="1.3.0",
Import-Package: org.junit;version="4.8.1",
org.osgi.framework;version="1.3.0",
org.osgi.util.tracker;version="1.3.1"
Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.equinox.http.registry;bundle-version="1.1.1",
javax.servlet;bundle-version="2.5.0",
Require-Bundle: javax.servlet;bundle-version="2.5.0",
com.sap.sailing.domain,
com.sap.sailing.domain.tractracadapter,
org.json.simple;bundle-version="1.1.0",
@@ -18,10 +18,10 @@ Require-Bundle: org.eclipse.equinox.http.registry;bundle-version="1.1.1",
com.sap.sailing.declination,
com.sap.sailing.mongodb,
com.mongodb.driver;bundle-version="2.6.2",
org.eclipse.osgi.services;bundle-version="3.3.0",
com.sap.sailing.httpservicetracker,
com.sap.sailing.domain.swisstimingadapter,
com.sap.sailing.domain.persistence,
com.sap.sailing.domain.swisstimingadapter.persistence
com.sap.sailing.domain.swisstimingadapter.persistence,
org.eclipse.jetty.xml;bundle-version="7.5.4"
Bundle-ClassPath: .
Export-Package: com.sap.sailing.server
Web-ContextPath: /sailingserver
java/com.sap.sailing.server/New SailingServer (No Proxy).launch
+29
View File
@@ -0,0 +1,29 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.pde.ui.EquinoxLauncher">
<booleanAttribute key="append.args" value="true"/>
<booleanAttribute key="automaticAdd" value="true"/>
<booleanAttribute key="automaticValidate" value="false"/>
<stringAttribute key="bootstrap" value=""/>
<stringAttribute key="checked" value="[NONE]"/>
<booleanAttribute key="clearConfig" value="false"/>
<stringAttribute key="configLocation" value="${workspace_loc}/target"/>
<booleanAttribute key="default" value="true"/>
<booleanAttribute key="default_auto_start" value="true"/>
<intAttribute key="default_start_level" value="4"/>
<stringAttribute key="deselected_workspace_plugins" value="com.blub,com.googlecode.java-diff-utils.test,com.sap.sailing.declination.test,com.sap.sailing.domain.swisstimingadapter.test,com.sap.sailing.domain.test,com.sap.sailing.expeditionconnector.test,com.sap.sailing.gwt.ui.test,com.sap.sailing.mongodb.test,com.sap.sailing.server.test"/>
<booleanAttribute key="includeOptional" value="true"/>
<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
</listAttribute>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -console -clean"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Declipse.ignoreApp=true -Dosgi.noShutdown=true&#13;&#10;-Dexpedition.udp.port=2010 -Xmx1024m -Djetty.home=C:/Projects/sailing/dev/runtime/configuration/jetty"/>
<stringAttribute key="pde.version" value="3.3"/>
<booleanAttribute key="show_selected_only" value="false"/>
<stringAttribute key="target_bundles" value="com.sap.ui5.commons@default:default,com.sap.ui5.core@default:default,com.sap.ui5.gwt.commons@default:default,com.sap.ui5.gwt.core@default:default,com.sap.ui5.resource.osgi@default:false,com.sap.ui5.resource@default:default,com.springsource.slf4j.api@default:default,com.springsource.slf4j.nop@default:false,javax.servlet.jsp@default:default,javax.servlet@default:default,javax.xml@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.servletbridge.extensionbundle@default:false,org.eclipse.equinox.transforms.hook@default:false,org.eclipse.jetty.continuation@default:default,org.eclipse.jetty.deploy@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.jmx@default:default,org.eclipse.jetty.nested@default:default,org.eclipse.jetty.osgi.boot@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.jetty.webapp@default:default,org.eclipse.jetty.xml@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,org.junit@default:default"/>
<booleanAttribute key="tracing" value="false"/>
<booleanAttribute key="useCustomFeatures" value="false"/>
<booleanAttribute key="useDefaultConfigArea" value="false"/>
<stringAttribute key="workspace_bundles" value="com.google.gwt.osgi@default:default,com.googlecode.java-diff-utils@default:default,com.mongodb.driver@default:default,com.sap.sailing.declination@default:default,com.sap.sailing.domain.persistence@default:default,com.sap.sailing.domain.swisstimingadapter.persistence@default:default,com.sap.sailing.domain.swisstimingadapter@default:default,com.sap.sailing.domain.tractracadapter.persistence@default:default,com.sap.sailing.domain.tractracadapter@default:default,com.sap.sailing.domain@default:default,com.sap.sailing.expeditionconnector@default:default,com.sap.sailing.gwt.ui@default:default,com.sap.sailing.httpservicetracker@default:default,com.sap.sailing.mongodb@default:default,com.sap.sailing.server@default:default,com.sap.sailing.udpconnector@default:default,com.sap.sailing.xcelsiusadapter@default:default,com.tractrac.clientmodule@default:default,com.tractrac.resultapi@default:default,org.json.simple@default:default"/>
</launchConfiguration>
java/com.sap.sailing.server/WEB-INF/web.xml
+23
View File
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" version="2.5">
<servlet>
<servlet-name>AdminApp</servlet-name>
<servlet-class>com.sap.sailing.server.AdminApp</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>AdminApp</servlet-name>
<url-pattern>/admin</url-pattern>
</servlet-mapping>
<servlet>
<servlet-name>ModeratorApp</servlet-name>
<servlet-class>com.sap.sailing.server.ModeratorApp</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>ModeratorApp</servlet-name>
<url-pattern>/moderator</url-pattern>
</servlet-mapping>
</web-app>
java/com.sap.sailing.server/build.properties
+2 -1
View File
@@ -1,5 +1,6 @@
source.. = src/
output.. = bin/
bin.includes = META-INF/,\
.
.,\
WEB-INF/
src.includes = configuration/
java/com.sap.sailing.server/src/com/sap/sailing/server/Activator.java
+7 -8
View File
@@ -16,7 +16,6 @@ import org.osgi.util.tracker.ServiceTracker;
import com.sap.sailing.domain.base.Event;
import com.sap.sailing.domain.base.RaceDefinition;
import com.sap.sailing.httpservicetracker.HttpServiceTracker;
import com.sap.sailing.util.Util.Triple;
public class Activator implements BundleActivator, ServiceListener {
@@ -24,7 +23,7 @@ public class Activator implements BundleActivator, ServiceListener {
private static BundleContext fContext;
private HttpServiceTracker httpServiceTracker;
// private HttpServiceTracker httpServiceTracker;
static BundleContext getDefault() {
return fContext;
@@ -39,10 +38,10 @@ public class Activator implements BundleActivator, ServiceListener {
// now track the HTTP service:
Map<String, Class<? extends javax.servlet.Servlet>> pathMap = new HashMap<String, Class<? extends javax.servlet.Servlet>>();
pathMap.put("/admin", AdminApp.class);
pathMap.put("/moderator", ModeratorApp.class);
httpServiceTracker = new HttpServiceTracker(context, pathMap, null);
httpServiceTracker.open();
// pathMap.put("/admin", AdminApp.class);
// pathMap.put("/moderator", ModeratorApp.class);
// httpServiceTracker = new HttpServiceTracker(context, pathMap, null);
// httpServiceTracker.open();
logger.log(Level.INFO, "Started "+context.getBundle().getSymbolicName()+". Character encoding: "+
Charset.defaultCharset());
}
@@ -60,8 +59,8 @@ public class Activator implements BundleActivator, ServiceListener {
service.stopTracking(event);
}
// stop tracking the HTTP service:
httpServiceTracker.close();
httpServiceTracker = null;
// httpServiceTracker.close();
// httpServiceTracker = null;
}
public void serviceChanged(ServiceEvent ev) {
java/com.sap.sailing.xcelsiusadapter/META-INF/MANIFEST.MF
+5 -6
View File
@@ -6,14 +6,13 @@ Bundle-Version: 1.0.0.qualifier
Bundle-Activator: com.sap.sailing.xcelsiusadapter.Activator
Bundle-Vendor: SAP
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.osgi.framework;version="1.3.0"
Import-Package: javax.servlet;version="2.5.0",
javax.servlet.http;version="2.5.0",
org.osgi.framework;version="1.6.0"
Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.osgi.services,
org.eclipse.osgi,
javax.servlet,
com.sap.sailing.httpservicetracker,
com.sap.sailing.server,
Require-Bundle: com.sap.sailing.server,
com.sap.sailing.domain,
com.sap.sailing.domain.tractracadapter
Bundle-ClassPath: lib/jdom.jar,
.
Web-ContextPath: /wind
java/com.sap.sailing.xcelsiusadapter/WEB-INF/web.xml
+14
View File
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" version="2.5">
<servlet>
<servlet-name>XcelsiusApp</servlet-name>
<servlet-class>com.sap.sailing.xcelsiusadapter.XcelsiusApp</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>XcelsiusApp</servlet-name>
<url-pattern>/xcelsius</url-pattern>
</servlet-mapping>
</web-app>
java/com.sap.sailing.xcelsiusadapter/src/com/sap/sailing/xcelsiusadapter/Activator.java
+5 -7
View File
@@ -6,8 +6,6 @@ import java.util.Map;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
import com.sap.sailing.httpservicetracker.HttpServiceTracker;
public class Activator implements BundleActivator {
private static BundleContext context;
@@ -16,7 +14,7 @@ public class Activator implements BundleActivator {
return context;
}
private HttpServiceTracker httpServiceTracker;
// private HttpServiceTracker httpServiceTracker;
/*
* (non-Javadoc)
@@ -28,8 +26,8 @@ public class Activator implements BundleActivator {
// now track the HTTP service:
Map<String, Class<? extends javax.servlet.Servlet>> pathMap = new HashMap<String, Class<? extends javax.servlet.Servlet>>();
pathMap.put("/xcelsius", XcelsiusApp.class);
httpServiceTracker = new HttpServiceTracker(context, pathMap, null);
httpServiceTracker.open();
// httpServiceTracker = new HttpServiceTracker(context, pathMap, null);
// httpServiceTracker.open();
}
/*
@@ -40,8 +38,8 @@ public class Activator implements BundleActivator {
public void stop(BundleContext bundleContext) throws Exception {
Activator.context = null;
// stop tracking the HTTP service:
httpServiceTracker.close();
httpServiceTracker = null;
// httpServiceTracker.close();
// httpServiceTracker = null;
}
}