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 08:58:52 UTC
svn commit: r1210812 - in /openejb/trunk/openejb/container/openejb-osgi:
pom.xml src/main/java/org/apache/openejb/core/osgi/impl/Activator.java
Author: rmannibucau
Date: Tue Dec 6 07:58:52 2011
New Revision: 1210812
URL: http://svn.apache.org/viewvc?rev=1210812&view=rev
Log:
updating openejb-osgi to be able to manage openejb-server. Thanks Charles for the patch.
Modified:
openejb/trunk/openejb/container/openejb-osgi/pom.xml
openejb/trunk/openejb/container/openejb-osgi/src/main/java/org/apache/openejb/core/osgi/impl/Activator.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=1210812&r1=1210811&r2=1210812&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-osgi/pom.xml (original)
+++ openejb/trunk/openejb/container/openejb-osgi/pom.xml Tue Dec 6 07:58:52 2011
@@ -64,53 +64,48 @@
<Bundle-Activator>org.apache.openejb.core.osgi.impl.Activator</Bundle-Activator>
<Export-Package>org.apache.openejb.core.osgi.*</Export-Package>
<Import-Package>
- javax.transaction;version="[1.1,1.2)",
- javax.transaction.xa;version="[1.1,1.2)",
- !org.apache.openejb.core.osgi.impl,
- org.apache.openejb;version="[3.1,4.2)",
- org.apache.openejb*;version="[3.1,4.2)",
- org.apache.openejb.loader;version="[3.1,4.2)",
- org.apache.openejb.core;version="[3.1,4.2)";resolution:=optional,
- org.apache.openejb.core.stateless;version="[3.1,4.2)";resolution:=optional,
- org.apache.openejb.core.stateful;version="[3.1,4.2)";resolution:=optional,
- org.apache.openejb.core.singleton;version="[3.1,4.2)";resolution:=optional,
- org.apache.openejb.core.mdb;version="[3.1,4.2)";resolution:=optional,
- org.apache.openejb.core.managed;version="[3.1,4.2)";resolution:=optional,
- org.apache.openejb.resource;version="[3.1,4.2)",
- org.apache.openejb.resource.jdbc;version="[3.1,4.2)";resolution:=optional,
- org.apache.openejb.resource.activemq;version="[3.1,4.2)";resolution:=optional,
- org.apache.openejb.resource.quartz;version="[3.1,4.2)";resolution:=optional,
- org.apache.openejb.core.security;version="[3.1,4.2)",
- org.apache.openejb.cdi;version="[3.1,4.2)",
- org.apache.openejb.config;version="[3.1,4.2)",
- org.apache.openejb.jee;version="[3.1,4.2)",
- org.apache.openejb.util;version="[3.1,4.2)",
- javax.naming,
- org.apache.commons.logging,
- org.apache.activemq.ra,
- org.osgi.framework;version="[1.4,1.6)",
- org.apache.commons.dbcp.managed;resolution:=optional,
- oracle.toplink.*;resolution:=optional,
- org.apache.openjpa.*;resolution:=optional,
- org.eclipse.persistence.*;resolution:=optional,
- org.hibernate.*;resolution:=optional,
- org.quartz.*;resolution:=optional,
- org.hsqldb.jdbc;resolution:=optional,
- javax.enterprise.deploy;resolution:=optional,
- javax.jms;resolution:=optional,
- javax.mail;resolution:=optional,
- javax.xml.registry;resolution:=optional,
- javax.xml.rpc;resolution:=optional,
- org.apache.activemq;resolution:=optional,
- org.apache.kahadb;resolution:=optional,
- org.apache.commons.dbcp;resolution:=optional,
- org.apache.xerces;resolution:=optional,
- org.apache.xml.resolver;resolution:=optional,
- org.junit;resolution:=optional,
- javax.annotation;version=1.1,
- javax.ejb;version=3.1,
- javax.xml.ws,
- *
+ javax.annotation;version=1.1,
+ javax.ejb;version=3.1,
+ javax.enterprise.deploy;resolution:=optional,
+ javax.jms;resolution:=optional,
+ javax.mail;resolution:=optional;version="[1.4,2)",
+ javax.naming,
+ javax.transaction;version="[1.1,1.2)",
+ javax.transaction.xa;version="[1.1,1.2)",
+ javax.xml.registry;resolution:=optional,
+ javax.xml.rpc;resolution:=optional,
+ javax.xml.ws,
+ org.apache.activemq;resolution:=optional;version="[5.4,6)",
+ org.apache.activemq.ra;version="[5.4,6)",
+ org.apache.commons.dbcp;resolution:=optional;version="[1.4,2)",
+ org.apache.commons.dbcp.managed;resolution:=optional;version="[1.4,2)",
+ org.apache.commons.logging,
+ org.apache.kahadb;resolution:=optional,
+ org.apache.openejb;version="[3.1,4.2)",
+ org.apache.openejb.assembler.classic;version="[3.1,4.2)",
+ 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.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)",
+ org.apache.openejb.core.singleton;resolution:=optional;version="[3.1,4.2)",
+ org.apache.openejb.core.stateful;resolution:=optional;version="[3.1,4.2)",
+ org.apache.openejb.core.stateless;resolution:=optional;version="[3.1,4.2)",
+ org.apache.openejb.jee;version="[3.1,4.2)",
+ org.apache.openejb.loader;version="[3.1,4.2)",
+ org.apache.openejb.resource;version="[3.1,4.2)",
+ org.apache.openejb.resource.activemq;resolution:=optional;version="[3.1,4.2)",
+ org.apache.openejb.resource.jdbc;resolution:=optional;version="[3.1,4.2)",
+ org.apache.openejb.resource.quartz;resolution:=optional;version="[3.1,4.2)",
+ org.apache.openejb.server;version="[3.1,4.2)",
+ org.apache.openejb.util;version="[3.1,4.2)",
+ org.apache.xerces;resolution:=optional,
+ org.apache.xml.resolver;resolution:=optional,
+ org.hsqldb.jdbc;resolution:=optional,
+ org.junit;resolution:=optional,
+ org.osgi.framework;version="[1.4,1.6)",
+ org.slf4j;version="[1.6,2)"
</Import-Package>
<Include-Resource>${pom.basedir}/src/main/resources</Include-Resource>
</instructions>
Modified: openejb/trunk/openejb/container/openejb-osgi/src/main/java/org/apache/openejb/core/osgi/impl/Activator.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-osgi/src/main/java/org/apache/openejb/core/osgi/impl/Activator.java?rev=1210812&r1=1210811&r2=1210812&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-osgi/src/main/java/org/apache/openejb/core/osgi/impl/Activator.java (original)
+++ openejb/trunk/openejb/container/openejb-osgi/src/main/java/org/apache/openejb/core/osgi/impl/Activator.java Tue Dec 6 07:58:52 2011
@@ -20,7 +20,6 @@ import org.apache.openejb.OpenEJB;
import org.apache.openejb.OpenEJBException;
import org.apache.openejb.loader.OpenEJBInstance;
import org.apache.openejb.loader.SystemInstance;
-import org.apache.openejb.util.ServiceManagerProxy;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
@@ -37,6 +36,7 @@ import java.util.Properties;
public class Activator implements BundleActivator {
private static final Logger LOGGER = LoggerFactory.getLogger(Activator.class);
private static final String SERVICE_MANAGER_NAME = "org.apache.openejb.server.ServiceManager";
+ private static final String OSGI_SERVICE_MANAGER_NAME = "org.apache.openejb.server.osgi.ServiceManagerExtender";
private OpenEJBInstance openejb;
@@ -70,7 +70,7 @@ public class Activator implements Bundle
try {
ServiceReference serviceManager = context.getServiceReference(SERVICE_MANAGER_NAME);
if (serviceManager == null) { // register a new instance
- Object sm = context.getBundle().loadClass(SERVICE_MANAGER_NAME)
+ Object sm = context.getBundle().loadClass(OSGI_SERVICE_MANAGER_NAME)
.getConstructor(BundleContext.class)
.newInstance(context);
context.registerService(SERVICE_MANAGER_NAME, sm, null);