revert removal of org.json.simple project

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/Activator.java

@@ -1,33 +1,18 @@
 package com.sap.sailing.gwt.ui.server;
 
-import java.util.HashMap;
-import java.util.Map;
-
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 
 public class Activator implements BundleActivator {
     private static BundleContext context;
-//    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);
-        Map<String, String> resourceMap = new HashMap<String, String>();
-//        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;
     }
     
     public static BundleContext getDefault() {

java/com.sap.sailing.targetplatform.features/target-base/feature.xml

@@ -32,18 +32,4 @@
          install-size="0"
          version="1.6.4"
          unpack="false"/>
-
-   <plugin
-         id="org.json.simple"
-         download-size="0"
-         install-size="0"
-         version="1.1.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.json.simple.source"
-         download-size="0"
-         install-size="0"
-         version="1.1.0"
-         unpack="false"/>
 </feature>

java/org.json.simple/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: json-simple
 Bundle-SymbolicName: org.json.simple
-Bundle-Version: 1.1.0
+Bundle-Version: 1.1.0.qualifier
 Bundle-Vendor: JSON Simple
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy

java/pom.xml

@@ -37,6 +37,7 @@
 		<module>com.sap.sailing.mongodb.test</module>
 		<module>com.tractrac.clientmodule</module>
 		<module>com.tractrac.resultapi</module>
+		<module>org.json.simple</module>
 		<module>com.mongodb.driver</module>
 		<module>com.googlecode.java-diff-utils</module>
 		<module>com.googlecode.java-diff-utils.test</module>