Mercurial > hg > release > thermostat-0.4

changeset 310:b1d7cdb6c3d6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix osgi build/runtime Reviewed-by: neugens, rkennke Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2012-May/001351.html
author Omair Majid <omajid@redhat.com>
date Wed, 16 May 2012 11:49:15 -0400
parents 8072798f65f7
children 14ee0c038fb6
files client/core/pom.xml client/core/src/main/java/com/redhat/thermostat/client/osgi/VMContextActionServiceTracker.java client/core/src/main/java/com/redhat/thermostat/client/osgi/VmInformationServiceTracker.java client/example/pom.xml client/killvm/pom.xml client/launcher/pom.xml client/vmclassstat/pom.xml common/pom.xml pom.xml unix-process-handler/pom.xml
diffstat 10 files changed, 61 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/client/core/pom.xml	Wed May 16 15:44:57 2012 +0200
+++ b/client/core/pom.xml	Wed May 16 11:49:15 2012 -0400
@@ -93,8 +93,14 @@
     </dependency>
     
     <dependency>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>org.apache.felix.framework</artifactId>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.core</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.compendium</artifactId>
+      <scope>provided</scope>
     </dependency>
     
   </dependencies>
--- a/client/core/src/main/java/com/redhat/thermostat/client/osgi/VMContextActionServiceTracker.java	Wed May 16 15:44:57 2012 +0200
+++ b/client/core/src/main/java/com/redhat/thermostat/client/osgi/VMContextActionServiceTracker.java	Wed May 16 11:49:15 2012 -0400
@@ -52,7 +52,7 @@
 
     @SuppressWarnings("unchecked")
     VMContextActionServiceTracker(BundleContext context, UiFacadeFactory uiFacadeFactory) {
-        super(context, VMContextAction.class, null);
+        super(context, VMContextAction.class.getName(), null);
         this.context = context;
         this.uiFacadeFactory = uiFacadeFactory;
     }
--- a/client/core/src/main/java/com/redhat/thermostat/client/osgi/VmInformationServiceTracker.java	Wed May 16 15:44:57 2012 +0200
+++ b/client/core/src/main/java/com/redhat/thermostat/client/osgi/VmInformationServiceTracker.java	Wed May 16 11:49:15 2012 -0400
@@ -51,7 +51,7 @@
     private BundleContext context;
 
     VmInformationServiceTracker(BundleContext context, UiFacadeFactory uiFacadeFactory) {
-        super(context, VmInformationService.class, null);
+        super(context, VmInformationService.class.getName(), null);
         this.context = context;
         this.uiFacadeFactory = uiFacadeFactory;
     }
--- a/client/example/pom.xml	Wed May 16 15:44:57 2012 +0200
+++ b/client/example/pom.xml	Wed May 16 11:49:15 2012 -0400
@@ -35,8 +35,8 @@
     </dependency>
     <dependency>
       <groupId>org.osgi</groupId>
-      <artifactId>osgi_R4_core</artifactId>
-      <version>1.0</version>
+      <artifactId>org.osgi.core</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>com.redhat.thermostat</groupId>
--- a/client/killvm/pom.xml	Wed May 16 15:44:57 2012 +0200
+++ b/client/killvm/pom.xml	Wed May 16 11:49:15 2012 -0400
@@ -50,8 +50,13 @@
     </dependency>
     <dependency>
       <groupId>org.osgi</groupId>
-      <artifactId>osgi_R4_core</artifactId>
-      <version>1.0</version>
+      <artifactId>org.osgi.core</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.compendium</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>com.redhat.thermostat</groupId>
--- a/client/launcher/pom.xml	Wed May 16 15:44:57 2012 +0200
+++ b/client/launcher/pom.xml	Wed May 16 11:49:15 2012 -0400
@@ -69,8 +69,20 @@
     </dependency>
     
     <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.core</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.compendium</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
       <groupId>org.apache.felix</groupId>
       <artifactId>org.apache.felix.framework</artifactId>
+      <scope>runtime</scope>
     </dependency>
     
     <dependency>
--- a/client/vmclassstat/pom.xml	Wed May 16 15:44:57 2012 +0200
+++ b/client/vmclassstat/pom.xml	Wed May 16 11:49:15 2012 -0400
@@ -50,8 +50,13 @@
     </dependency>
     <dependency>
       <groupId>org.osgi</groupId>
-      <artifactId>osgi_R4_core</artifactId>
-      <version>1.0</version>
+      <artifactId>org.osgi.core</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.compendium</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>com.redhat.thermostat</groupId>
--- a/common/pom.xml	Wed May 16 15:44:57 2012 +0200
+++ b/common/pom.xml	Wed May 16 11:49:15 2012 -0400
@@ -92,8 +92,9 @@
     </dependency>
     
     <dependency>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>org.apache.felix.framework</artifactId>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.core</artifactId>
+      <scope>provided</scope>
     </dependency>
     
   </dependencies>
--- a/pom.xml	Wed May 16 15:44:57 2012 +0200
+++ b/pom.xml	Wed May 16 11:49:15 2012 -0400
@@ -68,7 +68,13 @@
     <mongo-driver.version>2.7.3</mongo-driver.version>
     <commons-cli.version>1.2</commons-cli.version>
 
-    <felix.version>4.0.2</felix.version>
+    <!--
+         felix 4.0 is compliant with osgi 4.3
+         for osgi clients, 4.3 is backwards compatible with 4.2
+    -->
+    <osgi.core.version>4.2.0</osgi.core.version>
+    <osgi.compendium.version>4.2.0</osgi.compendium.version>
+    <felix.framework.version>4.0.2</felix.framework.version>
 
   </properties>
 
@@ -209,9 +215,19 @@
       </dependency>
     
       <dependency>
+        <groupId>org.osgi</groupId>
+        <artifactId>org.osgi.core</artifactId>
+        <version>${osgi.core.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.osgi</groupId>
+        <artifactId>org.osgi.compendium</artifactId>
+        <version>${osgi.compendium.version}</version>
+      </dependency>
+      <dependency>
         <groupId>org.apache.felix</groupId>
         <artifactId>org.apache.felix.framework</artifactId>
-        <version>${felix.version}</version>
+        <version>${felix.framework.version}</version>
       </dependency>
     
     </dependencies>
--- a/unix-process-handler/pom.xml	Wed May 16 15:44:57 2012 +0200
+++ b/unix-process-handler/pom.xml	Wed May 16 11:49:15 2012 -0400
@@ -39,8 +39,8 @@
 
     <dependency>
       <groupId>org.osgi</groupId>
-      <artifactId>osgi_R4_core</artifactId>
-      <version>1.0</version>
+      <artifactId>org.osgi.core</artifactId>
+      <scope>provided</scope>
     </dependency>
 
     <dependency>