JORAM-244: Update OSGi, felix and gogo version.

joram/a3/common/pom.xml

@@ -51,7 +51,7 @@
     </dependency>
     <dependency>
       <groupId>org.osgi</groupId>
-      <artifactId>org.osgi</artifactId>
+      <artifactId>org.osgi.core</artifactId>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file

joram/a3/services/src/main/java/fr/dyade/aaa/agent/services/A3ManagedService.java

 /*
  * JORAM: Java(TM) Open Reliable Asynchronous Messaging
- * Copyright (C) 2012 ScalAgent Distributed Technologies
+ * Copyright (C) 2012 - 2016 ScalAgent Distributed Technologies
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -88,7 +88,7 @@ public class A3ManagedService extends CommonService implements ManagedService {
     registration = bundleContext.registerService(
     		ManagedService.class.getName(),
         this,
-        props);
+        (Dictionary)props);
   }
 
   protected void doStop() {

joram/a3/services/src/main/java/fr/dyade/aaa/agent/services/CommonService.java

 /*
  * JORAM: Java(TM) Open Reliable Asynchronous Messaging
- * Copyright (C) 2012 ScalAgent Distributed Technologies
+ * Copyright (C) 2012 - 2016 ScalAgent Distributed Technologies
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -98,7 +98,7 @@ public class CommonService {
      bundleContext.registerService(
     		 ServerDesc.class.getName(),
     		 serverDesc,
-         props);
+    		 (Dictionary)props);
      if (logmon.isLoggable(BasicLevel.DEBUG))
        logmon.log(BasicLevel.DEBUG, "CommonService ServerDesc register: " + serverDesc); 
   }

joram/a3/services/src/main/java/fr/dyade/aaa/agent/services/JoramManagedService.java

 /*
  * JORAM: Java(TM) Open Reliable Asynchronous Messaging
- * Copyright (C) 2012 ScalAgent Distributed Technologies
+ * Copyright (C) 2012 - 2016 ScalAgent Distributed Technologies
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -89,7 +89,7 @@ public class JoramManagedService extends CommonService implements ManagedService
     registration = bundleContext.registerService(
     		ManagedService.class.getName(),
         this,
-        props);
+        (Dictionary)props);
   }
 
 

joram/jndi/client/src/main/java/fr/dyade/aaa/jndi2/osgi/Activator.java

 /*
  * JORAM: Java(TM) Open Reliable Asynchronous Messaging
- * Copyright (C) 2013 ScalAgent Distributed Technologies
+ * Copyright (C) 2013 - 2016 ScalAgent Distributed Technologies
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -22,6 +22,7 @@
  */
 package fr.dyade.aaa.jndi2.osgi;
 
+import java.util.Dictionary;
 import java.util.Properties;
 
 import org.objectweb.util.monolog.api.BasicLevel;
@@ -54,7 +55,7 @@ public class Activator implements BundleActivator {
     registration = context.registerService(
         javax.naming.spi.ObjectFactory.class.getName(),
         new scnURLContextFactory(),
-        props);
+        (Dictionary)props);
   }
 
   public void stop(BundleContext context) throws Exception {

joram/joram/client/jca/src/main/java/org/objectweb/joram/client/connector/JoramAdapter.java

 /*
  * JORAM: Java(TM) Open Reliable Asynchronous Messaging
- * Copyright (C) 2004 - 2012 ScalAgent Distributed Technologies
+ * Copyright (C) 2004 - 2016 ScalAgent Distributed Technologies
  * Copyright (C) 2004 - 2006 Bull SA
  *
  * This library is free software; you can redistribute it and/or
@@ -27,6 +27,7 @@ package org.objectweb.joram.client.connector;
 import java.io.FileNotFoundException;
 import java.net.ConnectException;
 import java.util.Date;
+import java.util.Dictionary;
 import java.util.Properties;
 
 import javax.jms.Connection;
@@ -510,7 +511,7 @@ public final class JoramAdapter extends JoramResourceAdapter implements JoramAda
       		registration =  Activator.context.registerService(
       				AdminItf.class.getName(),
       				wrapper,
-      				props);
+      				(Dictionary) props);
       		if (logger.isLoggable(BasicLevel.DEBUG))
       			logger.log(BasicLevel.DEBUG, "Bundle context " + Activator.context + " registerService AdminWrapper " + getName());
       	}

joram/joram/client/jms/src/main/java/org/objectweb/joram/client/osgi/Activator.java

 /*
- * Copyright (C) 2009 - 2013 ScalAgent Distributed Technologies
+ * Copyright (C) 2009 - 2016 ScalAgent Distributed Technologies
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -21,11 +21,15 @@
  */
 package org.objectweb.joram.client.osgi;
 
+import javax.naming.spi.ObjectFactory;
+
+import org.objectweb.joram.client.jms.admin.AdminModule;
 import org.objectweb.joram.client.jms.admin.JoramAdminConnect;
 import org.objectweb.util.monolog.api.BasicLevel;
 import org.objectweb.util.monolog.api.Logger;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
 
 import fr.dyade.aaa.common.Debug;
 
@@ -38,6 +42,8 @@ public class Activator implements BundleActivator {
   
   public static final Logger logmon = Debug.getLogger(Activator.class.getName());
   
+  public static final String ADMIN_XML_PATH = "joram.adminXML";
+  
   private JoramAdminConnect joramAdminConnect;
   private DestinationMSF destMSF = null;
   private UserMSF userMSF = null;
@@ -84,6 +90,23 @@ public class Activator implements BundleActivator {
   	sfq = new ServiceFtpQueue(context);
   	salq = new ServiceAliasQueue(context);
   	sadmin = new ServiceAdmin(context);
+  	
+  	ClassLoader myClassLoader = getClass().getClassLoader();
+  	ClassLoader originalContextClassLoader = Thread.currentThread().getContextClassLoader();
+  	try {
+  	  Thread.currentThread().setContextClassLoader(myClassLoader);
+  	  String adminXmlFile = context.getProperty(ADMIN_XML_PATH);
+  	  if (adminXmlFile != null) {
+  	    ServiceReference<ObjectFactory> ref = context.getServiceReference(javax.naming.spi.ObjectFactory.class);
+  	    if (ref == null) {
+  	      if (logmon.isLoggable(BasicLevel.ERROR))
+  	        logmon.log(BasicLevel.ERROR, "No ServiceReference for javax.naming.spi.ObjectFactory, start jndi client bundle to use jndi.");
+  	    }
+  	    AdminModule.executeXMLAdmin(adminXmlFile);
+  	  }
+  	} finally {
+  	  Thread.currentThread().setContextClassLoader(originalContextClassLoader);
+  	}
   }
 
   /* (non-Javadoc)

joram/joram/client/jms/src/main/java/org/objectweb/joram/client/osgi/ConnectionFactoryMSF.java

 /*
  * JORAM: Java(TM) Open Reliable Asynchronous Messaging
- * Copyright (C) 2012 ScalAgent Distributed Technologies
+ * Copyright (C) 2012 - 2016 ScalAgent Distributed Technologies
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -104,7 +104,7 @@ public class ConnectionFactoryMSF implements ManagedServiceFactory {
     registration = this.bundleContext.registerService(
     		ManagedServiceFactory.class.getName(),
         this,
-        props);
+        (Dictionary)props);
     cnxFactories = new HashMap<String, AbstractConnectionFactory>();
     jndiHelper = new JndiHelper();
     jndiNames = new HashMap<String, String>();

joram/joram/client/jms/src/main/java/org/objectweb/joram/client/osgi/DestinationMSF.java

 /*
  * JORAM: Java(TM) Open Reliable Asynchronous Messaging
- * Copyright (C) 2012 ScalAgent Distributed Technologies
+ * Copyright (C) 2012 - 2016 ScalAgent Distributed Technologies
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -127,7 +127,7 @@ public class DestinationMSF implements ManagedServiceFactory {
     registration = this.bundleContext.registerService(
     		ManagedServiceFactory.class.getName(),
         this,
-        props);
+        (Dictionary)props);
     destinations = new HashMap<String, Destination>();
     jndiHelper = new JndiHelper();
     jndiNames = new HashMap<String, String>();

joram/joram/client/jms/src/main/java/org/objectweb/joram/client/osgi/ServiceAcquisitionQueue.java

 /*
  * JORAM: Java(TM) Open Reliable Asynchronous Messaging
- * Copyright (C) 2012 ScalAgent Distributed Technologies
+ * Copyright (C) 2012 - 2016 ScalAgent Distributed Technologies
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -98,7 +98,7 @@ public class ServiceAcquisitionQueue extends ServiceDestination implements Manag
     registration = bundleContext.registerService(
     		ManagedServiceFactory.class.getName(),
         this,
-        props);
+        (Dictionary)props);
   }
    
   public void doStop() {

joram/joram/client/jms/src/main/java/org/objectweb/joram/client/osgi/ServiceAcquisitionTopic.java

 /*
  * JORAM: Java(TM) Open Reliable Asynchronous Messaging
- * Copyright (C) 2012 ScalAgent Distributed Technologies
+ * Copyright (C) 2012 - 2016 ScalAgent Distributed Technologies
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -98,7 +98,7 @@ public class ServiceAcquisitionTopic extends ServiceDestination implements Manag
     registration = bundleContext.registerService(
     		ManagedServiceFactory.class.getName(),
         this,
-        props);
+        (Dictionary)props);
   }
    
   public void doStop() {

joram/joram/client/jms/src/main/java/org/objectweb/joram/client/osgi/ServiceAdmin.java

 /*
  * JORAM: Java(TM) Open Reliable Asynchronous Messaging
- * Copyright (C) 2013 ScalAgent Distributed Technologies
+ * Copyright (C) 2013 - 2016 ScalAgent Distributed Technologies
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -116,7 +116,7 @@ public class ServiceAdmin implements ManagedServiceFactory {
     registration = this.bundleContext.registerService(
     		ManagedServiceFactory.class.getName(),
         this,
-        props);
+        (Dictionary)props);
     wrappers = new HashMap<String, AdminItf>();
     connections = new HashMap<String, Connection>();
   }
@@ -232,7 +232,7 @@ public class ServiceAdmin implements ManagedServiceFactory {
 	      registration =  bundleContext.registerService(
 	          AdminItf.class.getName(),
 	          wrapper,
-	          props);
+	          (Dictionary)props);
 
 	      if (logmon.isLoggable(BasicLevel.DEBUG))
 	        logmon.log(BasicLevel.DEBUG, "doUpdated registration =  " + registration);

joram/joram/client/jms/src/main/java/org/objectweb/joram/client/osgi/ServiceAliasQueue.java

 /*
  * JORAM: Java(TM) Open Reliable Asynchronous Messaging
- * Copyright (C) 2012 ScalAgent Distributed Technologies
+ * Copyright (C) 2012 - 2016 ScalAgent Distributed Technologies
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -94,7 +94,7 @@ public class ServiceAliasQueue extends ServiceDestination implements ManagedServ
     registration = bundleContext.registerService(
     		ManagedServiceFactory.class.getName(),
         this,
-        props);
+        (Dictionary)props);
   }
    
   public void doStop() {

joram/joram/client/jms/src/main/java/org/objectweb/joram/client/osgi/ServiceConnectionFactory.java

 /*
  * JORAM: Java(TM) Open Reliable Asynchronous Messaging
- * Copyright (C) 2012 - 2013 ScalAgent Distributed Technologies
+ * Copyright (C) 2012 - 2016 ScalAgent Distributed Technologies
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -103,7 +103,7 @@ public class ServiceConnectionFactory implements ManagedServiceFactory {
     registration = this.bundleContext.registerService(
     		ManagedServiceFactory.class.getName(),
         this,
-        props);
+        (Dictionary)props);
     cnxFactories = new HashMap<String, AbstractConnectionFactory>();
     jndiHelper = new JndiHelper();
     jndiNames = new HashMap<String, String>();

joram/joram/client/jms/src/main/java/org/objectweb/joram/client/osgi/ServiceDestination.java

 /*
  * JORAM: Java(TM) Open Reliable Asynchronous Messaging
- * Copyright (C) 2012 - 2013 ScalAgent Distributed Technologies
+ * Copyright (C) 2012 - 2016 ScalAgent Distributed Technologies
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -303,12 +303,12 @@ public abstract class ServiceDestination {
            reg = bundleContext.registerService(
                javax.jms.Queue.class.getName(),
                dest,
-               props);
+               (Dictionary)props);
          else
            reg = bundleContext.registerService(
                javax.jms.Topic.class.getName(),
                dest,
-               props);
+               (Dictionary)props);
          
          registrations.put(pid, reg);
   		 

joram/joram/client/jms/src/main/java/org/objectweb/joram/client/osgi/ServiceDistributionQueue.java

 /*
  * JORAM: Java(TM) Open Reliable Asynchronous Messaging
- * Copyright (C) 2012 ScalAgent Distributed Technologies
+ * Copyright (C) 2012 - 2016 ScalAgent Distributed Technologies
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -97,7 +97,7 @@ public class ServiceDistributionQueue extends ServiceDestination implements Mana
     registration = bundleContext.registerService(
     		ManagedServiceFactory.class.getName(),
         this,
-        props);
+        (Dictionary)props);
   }
    
   public void doStop() {

joram/joram/client/jms/src/main/java/org/objectweb/joram/client/osgi/ServiceDistributionTopic.java

 /*
  * JORAM: Java(TM) Open Reliable Asynchronous Messaging
- * Copyright (C) 2012 ScalAgent Distributed Technologies
+ * Copyright (C) 2012 - 2016 ScalAgent Distributed Technologies
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -97,7 +97,7 @@ public class ServiceDistributionTopic extends ServiceDestination implements Mana
     registration = bundleContext.registerService(
     		ManagedServiceFactory.class.getName(),
         this,
-        props);
+        (Dictionary)props);
   }
    
   public void doStop() {

joram/joram/client/jms/src/main/java/org/objectweb/joram/client/osgi/ServiceFtpQueue.java

 /*
  * JORAM: Java(TM) Open Reliable Asynchronous Messaging
- * Copyright (C) 2012 ScalAgent Distributed Technologies
+ * Copyright (C) 2012 - 2016 ScalAgent Distributed Technologies
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -97,7 +97,7 @@ public class ServiceFtpQueue extends ServiceDestination implements ManagedServic
     registration = bundleContext.registerService(
     		ManagedServiceFactory.class.getName(),
         this,
-        props);
+        (Dictionary)props);
   }
    
   public void doStop() {

joram/joram/client/jms/src/main/java/org/objectweb/joram/client/osgi/ServiceQueue.java

 /*
  * JORAM: Java(TM) Open Reliable Asynchronous Messaging
- * Copyright (C) 2012 ScalAgent Distributed Technologies
+ * Copyright (C) 2012 - 2016 ScalAgent Distributed Technologies
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -93,7 +93,7 @@ public class ServiceQueue extends ServiceDestination implements ManagedServiceFa
     registration = bundleContext.registerService(
         ManagedServiceFactory.class.getName(),
         this,
-        props);
+        (Dictionary)props);
   }
 
   public void doStop() {

joram/joram/client/jms/src/main/java/org/objectweb/joram/client/osgi/ServiceSchedulerQueue.java

 /*
  * JORAM: Java(TM) Open Reliable Asynchronous Messaging
- * Copyright (C) 2012 ScalAgent Distributed Technologies
+ * Copyright (C) 2012 - 2016 ScalAgent Distributed Technologies
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -94,7 +94,7 @@ public class ServiceSchedulerQueue extends ServiceDestination implements Managed
     registration = bundleContext.registerService(
     		ManagedServiceFactory.class.getName(),
         this,
-        props);
+        (Dictionary)props);
   }
    
   public void doStop() {

joram/joram/client/jms/src/main/java/org/objectweb/joram/client/osgi/ServiceTopic.java

 /*
  * JORAM: Java(TM) Open Reliable Asynchronous Messaging
- * Copyright (C) 2012 ScalAgent Distributed Technologies
+ * Copyright (C) 2012 - 2016 ScalAgent Distributed Technologies
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -94,7 +94,7 @@ public class ServiceTopic extends ServiceDestination implements ManagedServiceFa
     registration = bundleContext.registerService(
         ManagedServiceFactory.class.getName(),
         this,
-        props);
+        (Dictionary)props);
   }
 
   public void doStop() {

joram/joram/client/jms/src/main/java/org/objectweb/joram/client/osgi/ServiceUser.java

 /*
  * JORAM: Java(TM) Open Reliable Asynchronous Messaging
- * Copyright (C) 2012 ScalAgent Distributed Technologies
+ * Copyright (C) 2012 - 2016 ScalAgent Distributed Technologies
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -123,7 +123,7 @@ public class ServiceUser implements ManagedServiceFactory {
     registration = this.bundleContext.registerService(
     		ManagedServiceFactory.class.getName(),
         this,
-        props);
+        (Dictionary)props);
     users = new HashMap<String, User>();
     jndiHelper = new JndiHelper();
     jndiNames = new HashMap<String, String>();

joram/joram/client/jms/src/main/java/org/objectweb/joram/client/osgi/UserMSF.java

 /*
  * JORAM: Java(TM) Open Reliable Asynchronous Messaging
- * Copyright (C) 2012 ScalAgent Distributed Technologies
+ * Copyright (C) 2012 - 2016 ScalAgent Distributed Technologies
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -122,7 +122,7 @@ public class UserMSF implements ManagedServiceFactory {
     registration = this.bundleContext.registerService(
     		ManagedServiceFactory.class.getName(),
         this,
-        props);
+        (Dictionary)props);
     users = new HashMap<String, User>();
     jndiHelper = new JndiHelper();
     jndiNames = new HashMap<String, String>();

joram/joram/jca/ra/pom.xml

@@ -62,7 +62,7 @@
     </dependency>
     <dependency>
       <groupId>org.osgi</groupId>
-      <artifactId>org.osgi</artifactId>
+      <artifactId>org.osgi.core</artifactId>
     </dependency>
   </dependencies>
 

joram/joram/jca/remote/pom.xml

@@ -52,7 +52,7 @@
     </dependency>
     <dependency>
       <groupId>org.osgi</groupId>
-      <artifactId>org.osgi</artifactId>
+      <artifactId>org.osgi.core</artifactId>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file

joram/joram/mom/amqp/pom.xml

@@ -52,7 +52,7 @@
       <version>${project.version}</version>
       <exclusions>
         <exclusion>
-          <artifactId>org.osgi</artifactId>
+          <artifactId>org.osgi.core</artifactId>
           <groupId>org.osgi</groupId>
         </exclusion>
       </exclusions>

joram/pom.xml

@@ -180,19 +180,19 @@
     <jftp.version>1.52</jftp.version>
     <ow2-jms-2.0-spec.version>1.0.0</ow2-jms-2.0-spec.version>
     <ow2-jta-1.1-spec.version>1.0.13</ow2-jta-1.1-spec.version>
-    <osgi.compendium.version>4.2.0</osgi.compendium.version>
-    <org.osgi.version>3.0.0</org.osgi.version>
+    <osgi.compendium.version>5.0.0</osgi.compendium.version>
+    <org.osgi.core.version>6.0.0</org.osgi.core.version>
     <activation.version>1.1.1</activation.version>
     <commons-dbcp.version>1.2.2</commons-dbcp.version>
     <mysql-connector-java.version>5.1.6</mysql-connector-java.version>
     <connector.version>1.0.3</connector.version>
-    <felix.main.version>4.2.0</felix.main.version>
+    <felix.main.version>5.4.0</felix.main.version>
     <felix.shell.version>1.4.2</felix.shell.version>
     <felix.remote.version>1.1.2</felix.remote.version>
     <felix.tui.version>1.4.1</felix.tui.version>
-    <felix.gogo.runtime.version>0.10.0</felix.gogo.runtime.version>
-    <felix.gogo.command.version>0.12.0</felix.gogo.command.version>
-    <felix.gogo.shell.version>0.10.0</felix.gogo.shell.version>
+    <felix.gogo.runtime.version>0.16.2</felix.gogo.runtime.version>
+    <felix.gogo.command.version>0.16.0</felix.gogo.command.version>
+    <felix.gogo.shell.version>0.12.0</felix.gogo.shell.version>
     <maven.bundle.plugin.version>2.3.7</maven.bundle.plugin.version>
     <!-- to prevent [WARNING] Using platform encoding -->
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -232,8 +232,8 @@
       </dependency>
       <dependency>
         <groupId>org.osgi</groupId>
-        <artifactId>org.osgi</artifactId>
-        <version>${org.osgi.version}</version>
+        <artifactId>org.osgi.core</artifactId>
+        <version>${org.osgi.core.version}</version>
         <type>jar</type>
       </dependency>
       <dependency>
@@ -327,7 +327,7 @@
     </dependency>
     <dependency>
       <groupId>org.osgi</groupId>
-      <artifactId>org.osgi</artifactId>
+      <artifactId>org.osgi.core</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>

joram/shell/a3/pom.xml

@@ -34,7 +34,7 @@
 	<dependencies>
     <dependency>
       <groupId>org.osgi</groupId>
-      <artifactId>org.osgi</artifactId>
+      <artifactId>org.osgi.core</artifactId>
     </dependency>
     <dependency>
       <groupId>org.ow2.joram</groupId>

joram/shell/jndi/pom.xml

@@ -32,7 +32,7 @@
 	<dependencies>
     <dependency>
       <groupId>org.osgi</groupId>
-      <artifactId>org.osgi</artifactId>
+      <artifactId>org.osgi.core</artifactId>
     </dependency>
     <dependency>
       <groupId>org.ow2.joram</groupId>

joram/shell/mom/pom.xml

@@ -33,7 +33,7 @@
 	<dependencies>
     <dependency>
       <groupId>org.osgi</groupId>
-      <artifactId>org.osgi</artifactId>
+      <artifactId>org.osgi.core</artifactId>
     </dependency>
     <dependency>
       <groupId>org.ow2.joram</groupId>