You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2011/12/06 16:42:12 UTC
svn commit: r1210985 - in /openejb/trunk/openejb:
container/openejb-osgi/pom.xml pom.xml
server/openejb-server/src/main/java/org/apache/openejb/server/osgi/ServiceManagerExtender.java
Author: rmannibucau
Date: Tue Dec 6 15:42:11 2011
New Revision: 1210985
URL: http://svn.apache.org/viewvc?rev=1210985&view=rev
Log:
OPENEJB-1717 another merged patch from Charles for OSGi integration
Modified:
openejb/trunk/openejb/container/openejb-osgi/pom.xml
openejb/trunk/openejb/pom.xml
openejb/trunk/openejb/server/openejb-server/src/main/java/org/apache/openejb/server/osgi/ServiceManagerExtender.java
Modified: openejb/trunk/openejb/container/openejb-osgi/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-osgi/pom.xml?rev=1210985&r1=1210984&r2=1210985&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-osgi/pom.xml (original)
+++ openejb/trunk/openejb/container/openejb-osgi/pom.xml Tue Dec 6 15:42:11 2011
@@ -91,6 +91,7 @@
org.apache.openejb.cdi;version="[3.1,4.2)",
org.apache.openejb.config;version="[3.1,4.2)",
org.apache.openejb.core;resolution:=optional;version="[3.1,4.2)",
+ org.apache.openejb.core.ivm;version="[3.1,4.2)",
org.apache.openejb.core.managed;resolution:=optional;version="[3.1,4.2)",
org.apache.openejb.core.mdb;resolution:=optional;version="[3.1,4.2)",
org.apache.openejb.core.security;version="[3.1,4.2)",
Modified: openejb/trunk/openejb/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/pom.xml?rev=1210985&r1=1210984&r2=1210985&view=diff
==============================================================================
--- openejb/trunk/openejb/pom.xml (original)
+++ openejb/trunk/openejb/pom.xml Tue Dec 6 15:42:11 2011
@@ -133,6 +133,7 @@
<myfaces.version>2.1.2</myfaces.version>
<slf4j.version>1.6.1</slf4j.version>
<log4j.version>1.2.16</log4j.version>
+ <osgi.framework.version>4.2.0</osgi.framework.version>
</properties>
<build>
@@ -1174,12 +1175,12 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>4.2.0</version>
+ <version>${osgi.framework.version}</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
- <version>4.2.0</version>
+ <version>${osgi.framework.version}</version>
</dependency>
<dependency>
<groupId>javassist</groupId>
Modified: openejb/trunk/openejb/server/openejb-server/src/main/java/org/apache/openejb/server/osgi/ServiceManagerExtender.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-server/src/main/java/org/apache/openejb/server/osgi/ServiceManagerExtender.java?rev=1210985&r1=1210984&r2=1210985&view=diff
==============================================================================
--- openejb/trunk/openejb/server/openejb-server/src/main/java/org/apache/openejb/server/osgi/ServiceManagerExtender.java (original)
+++ openejb/trunk/openejb/server/openejb-server/src/main/java/org/apache/openejb/server/osgi/ServiceManagerExtender.java Tue Dec 6 15:42:11 2011
@@ -16,18 +16,6 @@
*/
package org.apache.openejb.server.osgi;
-import java.io.BufferedInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-
import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.server.DiscoveryRegistry;
import org.apache.openejb.server.ServerService;
@@ -41,6 +29,18 @@ import org.osgi.framework.ServiceRegistr
import org.osgi.util.tracker.BundleTracker;
import org.osgi.util.tracker.BundleTrackerCustomizer;
+import java.io.BufferedInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+
/**
* @version $Rev$ $Date$
*/
@@ -60,7 +60,7 @@ public class ServiceManagerExtender exte
}
public void init() throws Exception {
- if (started != null) {
+ if (started != null && started.equals(Boolean.TRUE)) {
throw new IllegalStateException("ServiceManager is already initialized");
}
DiscoveryRegistry registry = new DiscoveryRegistry();