Author: rmannibucau
Date: Thu Dec 22 12:49:04 2011
New Revision: 1222207
URL: http://svn.apache.org/viewvc?rev=1222207&view=rev
Log:
fixing OSGi imports to get the OSGi extension managed
Modified:
openejb/trunk/openejb/container/openejb-osgi/pom.xml
openejb/trunk/openejb/container/openejb-osgi/src/main/java/org/apache/openejb/core/osgi/impl/Deployer.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=1222207&r1=1222206&r2=1222207&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-osgi/pom.xml (original)
+++ openejb/trunk/openejb/container/openejb-osgi/pom.xml Thu Dec 22 12:49:04
2011
@@ -70,23 +70,88 @@
<Export-Package>org.apache.openejb.core.osgi.*</Export-Package>
<Import-Package>
'=META-INF.org^.apache^.openejb',
- javax.annotation;version=1.1;resolution:=optional,
- javax.ejb;version=3.1,
+ javax.annotation;version="[1.1.0,2.0.0)";resolution:=optional,
javax.enterprise.deploy;resolution:=optional,
javax.jms;resolution:=optional,
javax.mail;resolution:=optional;version="[1.4,2)",
javax.naming,
+ javax.enterprise.util,
+ javax.xml.registry;resolution:=optional,
+ javax.xml.rpc;resolution:=optional,
+ javax.annotation.security;version="[1.1.0,2.0.0)",
+ javax.annotation.sql;version="[1.1.0,2.0.0)",
+ javax.crypto,
+ javax.crypto.spec,
+ javax.el,
+ javax.decorator;resolution:=optional,
+ javax.ejb,
+ javax.ejb.embeddable,
+ javax.ejb.spi,
javax.enterprise.context,
javax.enterprise.context.spi,
+ javax.enterprise.deploy.model;resolution:=optional,
+ javax.enterprise.deploy.shared;resolution:=optional,
+ javax.enterprise.deploy.spi;resolution:=optional,
+ javax.enterprise.deploy.spi.exceptions;resolution:=optional,
+ javax.enterprise.deploy.spi.factories;resolution:=optional,
+ javax.enterprise.deploy.spi.status;resolution:=optional,
javax.enterprise.event,
javax.enterprise.inject,
javax.enterprise.inject.spi,
- javax.enterprise.util,
- 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.inject,
+ javax.interceptor,
+ javax.jws,
+ javax.management,
+ javax.management.j2ee,
+ javax.management.loading,
+ javax.management.openmbean,
+ javax.naming.spi,
+ javax.persistence,
+ javax.persistence.criteria,
+ javax.persistence.metamodel,
+ javax.persistence.spi,
+ javax.resource,
+ javax.resource.spi,
+ javax.resource.spi.endpoint,
+ javax.resource.spi.work,
+ javax.security.auth,
+ javax.security.auth.callback,
+ javax.security.auth.login,
+ javax.security.auth.message.callback,
+ javax.security.auth.spi,
+ javax.security.jacc,
+ javax.servlet,
+ javax.servlet.http,
+ javax.servlet.jsp,
+ javax.sql,
+ javax.transaction;version="[1.1.0,2.0.0)",
+ javax.transaction.xa;version="[1.1.0,2.0.0)",
+ javax.validation,
+ javax.validation.bootstrap,
+ javax.ws.rs,
+ javax.ws.rs.core,
+ javax.ws.rs.ext,
+ javax.wsdl,
+ javax.wsdl.extensions.http,
+ javax.wsdl.extensions.soap,
+ javax.wsdl.factory,
+ javax.wsdl.xml,
+ javax.xml.bind,
+ javax.xml.bind.annotation,
+ javax.xml.bind.annotation.adapters,
+ javax.xml.datatype,
+ javax.xml.namespace,
+ javax.xml.parsers,
+ javax.xml.rpc.handler;resolution:=optional,
+ javax.xml.transform,
+ javax.xml.transform.sax,
+ javax.xml.transform.stream,
+ javax.xml.validation,
javax.xml.ws,
+ javax.xml.ws.handler,
+ javax.xml.ws.soap,
+ javax.xml.ws.spi,
+ javax.xml.ws.wsaddressing,
org.apache.bval.jsr303.resolver,
org.apache.activemq;resolution:=optional;version="[5.4,6)",
org.apache.activemq.ra;version="[5.4,6)";resolution:=optional,
Modified:
openejb/trunk/openejb/container/openejb-osgi/src/main/java/org/apache/openejb/core/osgi/impl/Deployer.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-osgi/src/main/java/org/apache/openejb/core/osgi/impl/Deployer.java?rev=1222207&r1=1222206&r2=1222207&view=diff
==============================================================================
---
openejb/trunk/openejb/container/openejb-osgi/src/main/java/org/apache/openejb/core/osgi/impl/Deployer.java
(original)
+++
openejb/trunk/openejb/container/openejb-osgi/src/main/java/org/apache/openejb/core/osgi/impl/Deployer.java
Thu Dec 22 12:49:04 2011
@@ -114,7 +114,7 @@ public class Deployer implements BundleL
paths.put(bundle, appInfo.path);
final Assembler assembler =
SystemInstance.get().getComponent(Assembler.class);
- final AppContext appContext =
assembler.createApplication(appInfo);
+ final AppContext appContext =
assembler.createApplication(appInfo, osgiCl);
LOGGER.info("Application deployed: " + appInfo.path);
registrations.put(bundle, new
ArrayList<ServiceRegistration>());
