From da191d331e642b6acb8b9145a9025df7cce60c52 Mon Sep 17 00:00:00 2001
From: Simon Pamies <simon.marcel.pamies@sap.com>
Date: Thu, 10 Jan 2013 13:37:04 +0100
Subject: [PATCH] Updating target platform to include new plugins, updated
 monitoring to refer to those

---
 java/com.sap.sailing.monitoring/.classpath         |  2 --
 .../META-INF/MANIFEST.MF                           |  6 +++---
 .../features/target-base/feature.xml               | 14 ++++++++++++++
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/java/com.sap.sailing.monitoring/.classpath b/java/com.sap.sailing.monitoring/.classpath
index e0a7ed7642e..098194ca4b7 100644
--- a/java/com.sap.sailing.monitoring/.classpath
+++ b/java/com.sap.sailing.monitoring/.classpath
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="lib" path="lib/mail.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="lib" path="lib/sigar.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/java/com.sap.sailing.monitoring/META-INF/MANIFEST.MF b/java/com.sap.sailing.monitoring/META-INF/MANIFEST.MF
index e306fbb8569..e93dde3903d 100644
--- a/java/com.sap.sailing.monitoring/META-INF/MANIFEST.MF
+++ b/java/com.sap.sailing.monitoring/META-INF/MANIFEST.MF
@@ -8,6 +8,6 @@ Bundle-Vendor: SAP
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Import-Package: org.osgi.framework;version="1.3.0"
 Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: lib/mail.jar,
- lib/sigar.jar,
- .
+Bundle-ClassPath: .
+Require-Bundle: org.hyperic.sigar;bundle-version="1.6.4",
+ com.sun.mail.javax.mail;bundle-version="1.4.5"
diff --git a/java/com.sap.sailing.targetplatform.base/features/target-base/feature.xml b/java/com.sap.sailing.targetplatform.base/features/target-base/feature.xml
index 8e2ac61d829..5c80bb6041b 100644
--- a/java/com.sap.sailing.targetplatform.base/features/target-base/feature.xml
+++ b/java/com.sap.sailing.targetplatform.base/features/target-base/feature.xml
@@ -54,4 +54,18 @@
          version="1.6.0"
          unpack="false"/>
 
+   <plugin
+         id="javax.mail"
+         download-size="0"
+         install-size="0"
+         version="1.4.5"
+         unpack="false"/>
+
+   <plugin
+         id="org.hyperic.sigar"
+         download-size="0"
+         install-size="0"
+         version="1.6.4"
+         unpack="false"/>
+
 </feature>