moved org.json.simple from bundle project to target-base

java/com.sap.sailing.domain.test/META-INF/MANIFEST.MF

@@ -8,8 +8,9 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: com.sap.sailing.domain,
  com.tractrac.clientmodule,
  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"
+Import-Package: org.json.simple,
+ org.json.simple.parser,
+ org.junit;version="4.8.1"

java/com.sap.sailing.domain.tractracadapter/META-INF/MANIFEST.MF

@@ -7,9 +7,10 @@ Bundle-Vendor: SAP
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: com.sap.sailing.domain,
  com.tractrac.clientmodule,
- org.json.simple;bundle-version="1.1.0",
  com.tractrac.resultapi,
  com.googlecode.java-diff-utils;bundle-version="1.3.0"
 Export-Package: com.sap.sailing.domain.tractracadapter,
  com.sap.sailing.domain.tractracadapter.impl;x-friends:="com.sap.sailing.domain.test"
 Bundle-ActivationPolicy: lazy
+Import-Package: org.json.simple,
+ org.json.simple.parser

java/com.sap.sailing.gwt.ui.test/META-INF/MANIFEST.MF

@@ -6,12 +6,14 @@ Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: SAP
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: com.sap.sailing.gwt.ui,
- javax.servlet;bundle-version="2.5.0",
  com.sap.sailing.domain,
- org.json.simple,
  com.sap.sailing.server,
  com.google.gwt.osgi;bundle-version="2.4.0"
 Bundle-ClassPath: .
 Import-Package: org.osgi.framework,
+ javax.servlet;version="2.5.0",
+ javax.servlet.http;version="2.5.0",
  org.osgi.util.tracker;version="1.5.0",
- org.junit;version="4.8.1"
+ org.junit;version="4.8.1",
+ org.json.simple,
+ org.json.simple.parser

java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF

@@ -9,7 +9,6 @@ Eclipse-RegisterBuddy: com.google.gwt.osgi
 Require-Bundle: com.sap.sailing.domain,
  com.sap.sailing.server,
  com.sap.sailing.domain.tractracadapter,
- org.json.simple;bundle-version="1.1.0",
  com.sap.sailing.mongodb,
  com.mongodb.driver;bundle-version="2.6.2",
  com.sap.ui5.commons,
@@ -33,7 +32,9 @@ Export-Package: com.sap.sailing.gwt.ui.client;x-friends:="com.sap.sailing.gwt.ui
  com.sap.sailing.gwt.ui.shared;x-friends:="com.sap.sailing.gwt.ui.test"
 Import-Package: org.osgi.framework,
  org.osgi.util.tracker,
- javax.servlet,
+ javax.servlet;version="2.5.0",
- javax.servlet.http
+ javax.servlet.http;version="2.5.0",
+ org.json.simple,
+ org.json.simple.parser
 Web-ContextPath: /
 Jetty-WarFolderPath: war

java/com.sap.sailing.server/META-INF/MANIFEST.MF

@@ -9,11 +9,12 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: javax.servlet;version="2.5.0",
  javax.servlet.http;version="2.5.0",
  org.osgi.framework;version="1.3.0",
- org.osgi.util.tracker;version="1.3.1"
+ org.osgi.util.tracker;version="1.3.1",
+ org.json.simple,
+ org.json.simple.parser
 Bundle-ActivationPolicy: lazy
 Require-Bundle: com.sap.sailing.domain,
  com.sap.sailing.domain.tractracadapter,
- org.json.simple;bundle-version="1.1.0",
  com.sap.sailing.expeditionconnector,
  com.sap.sailing.declination,
  com.sap.sailing.mongodb,

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

@@ -32,4 +32,18 @@
          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/com.sap.sailing.targetplatform/scripts/createp2repo.sh

@@ -3,9 +3,9 @@
 set -u
 
 ECLIPSE_VM_ARGS="-Xmx256m"
-auncher_*.jar
+ECLIPSE_LAUNCHER=C:/Projects/sailing/dev/eclipse_versions/v371_jee/eclipse/plugins/org.eclipse.equinox.launcher_*.jar
 
-java -jar ${ECLIPSE_EXE} -consolelog -nosplash -verbose -application org.eclipse.equinox.p2.publisher.UpdateSitePublisher \
+java -jar ${ECLIPSE_LAUNCHER} -consolelog -nosplash -verbose -application org.eclipse.equinox.p2.publisher.UpdateSitePublisher \
   -metadataRepository file:/C:/Projects/sailing/dev/p2-repositories/sailing \
   -artifactRepository file:/C:/Projects/sailing/dev/p2-repositories/sailing \
   -source C:/Projects/sailing/dev/p2-repositories/sailing_libs_source \

java/com.tractrac.clientmodule/META-INF/MANIFEST.MF

@@ -49,7 +49,6 @@ Export-Package: com.maptrack.asio,
  com.tractrac.clientmodule.setup,
  com.tractrac.clientmodule.test,
  net.jcip.annotations,
- org.json,
  ucar.grib,
  ucar.grib.grib1,
  ucar.grib.grib2,

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.qualifier
+Bundle-Version: 1.1.0
 Bundle-Vendor: JSON Simple
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy