Skip to content

Commit

Permalink
Finish hybrid mode. Works with the EE integration part.
Browse files Browse the repository at this point in the history
  • Loading branch information
@mathieuancelin @alesj
mathieuancelin authored and alesj committed Oct 12, 2012
1 parent 235de6b commit eaea70a
Showing 1 changed file with 161 additions and 37 deletions.
198 changes: 161 additions & 37 deletions ...c/main/java/org/jboss/weld/environment/osgi/impl/extension/service/WeldOSGiExtension.java
View file
Expand Up @@ -16,6 +16,9 @@
*/
package org.jboss.weld.environment.osgi.impl.extension.service;

import java.io.File;
import java.io.InputStream;
import java.util.Dictionary;
import javax.naming.NamingException;
import org.jboss.weld.environment.osgi.api.Service;
import org.jboss.weld.environment.osgi.api.annotation.Filter;
Expand All @@ -32,7 +35,11 @@
import org.jboss.weld.environment.osgi.impl.extension.beans.ServiceRegistryImpl;
import org.jboss.weld.environment.osgi.impl.integration.InstanceHolder;
import org.osgi.framework.BundleContext;
import org.osgi.framework.BundleException;
import org.osgi.framework.BundleListener;
import org.osgi.framework.BundleReference;
import org.osgi.framework.FrameworkListener;
import org.osgi.framework.ServiceRegistration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand All @@ -59,6 +66,7 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
import javax.enterprise.inject.spi.AfterDeploymentValidation;
import javax.naming.Context;
import javax.naming.InitialContext;
import org.jboss.weld.environment.osgi.api.events.AbstractBundleEvent;
Expand Down Expand Up @@ -107,6 +115,7 @@ public class WeldOSGiExtension implements Extension {
private List<Exception> exceptions = new ArrayList<Exception>();
private BeanManager beanManager;
private HybridListener listener;
private BundleContextDelegate delegate;

void registerCDIOSGiBeans(@Observes BeforeBeanDiscovery event,
BeanManager manager) {
Expand All @@ -124,6 +133,10 @@ void registerCDIOSGiBeans(@Observes BeforeBeanDiscovery event,
event.addAnnotatedType(
manager.createAnnotatedType(InstanceHolder.class));
this.beanManager = manager;
if (!Activator.osgiStarted() && WeldOSGiExtension.autoRunInHybridMode) {
delegate = new BundleContextDelegate();
currentContext.set(delegate);
}
}

/**
Expand Down Expand Up @@ -210,13 +223,6 @@ void registerCDIOSGiServices(@Observes AfterBeanDiscovery event) {
addServiceProducer(event, this.serviceProducerToBeInjected.get(type));
}
}
//
// void afterDeployment(@Observes AfterDeploymentValidation event) {
// if (!Activator.osgiStarted() && WeldOSGiExtension.autoRunInHybridMode) {
// logger.warn("Starting Weld-OSGi extension in hybrid mode.");
// runExtensionInHybridMode(); // should work if the current classloader is based on osgi classloader
// }
// }

public void startHybridMode() {
if (!Activator.osgiStarted() && WeldOSGiExtension.autoRunInHybridMode) {
Expand All @@ -242,30 +248,36 @@ private void runExtensionInHybridMode() {
logger.warn("Cannot lookup JNDI BundleContext.");
}
if (bc == null) {
if (!servicesToBeInjected.isEmpty()) {
Set<InjectionPoint> injections =
servicesToBeInjected.values().iterator().next();
if (!injections.isEmpty()) {
InjectionPoint ip = injections.iterator().next();
Class annotatedElt = ip.getMember().getDeclaringClass();
bc = BundleReference.class.cast(annotatedElt.getClassLoader()).getBundle().getBundleContext();
listener = runInHybridMode(bc);
}
} else if (!serviceProducerToBeInjected.isEmpty()) {
Set<InjectionPoint> injections =
serviceProducerToBeInjected.values().iterator().next();
if (!injections.isEmpty()) {
InjectionPoint ip = injections.iterator().next();
Class annotatedElt = ip.getMember().getDeclaringClass();
bc = BundleReference.class.cast(annotatedElt.getClassLoader()).getBundle().getBundleContext();
try {
if (!servicesToBeInjected.isEmpty()) {
Set<InjectionPoint> injections =
servicesToBeInjected.values().iterator().next();
if (!injections.isEmpty()) {
InjectionPoint ip = injections.iterator().next();
Class annotatedElt = ip.getMember().getDeclaringClass();
bc = BundleReference.class.cast(annotatedElt.getClassLoader()).getBundle().getBundleContext();
listener = runInHybridMode(bc);
}
} else if (!serviceProducerToBeInjected.isEmpty()) {
Set<InjectionPoint> injections =
serviceProducerToBeInjected.values().iterator().next();
if (!injections.isEmpty()) {
InjectionPoint ip = injections.iterator().next();
Class annotatedElt = ip.getMember().getDeclaringClass();
bc = BundleReference.class.cast(annotatedElt.getClassLoader()).getBundle().getBundleContext();
listener = runInHybridMode(bc);
}
} else {
bc = BundleReference.class.cast(getClass().getClassLoader()).getBundle().getBundleContext();
logger.warn("Starting the extension assuming the bundle is {}",
bc.getBundle().getSymbolicName());
listener = runInHybridMode(bc);
}
} else {
bc = BundleReference.class.cast(getClass().getClassLoader()).getBundle().getBundleContext();
logger.warn("Starting the extension assuming the bundle is {}",
bc.getBundle().getSymbolicName());
listener = runInHybridMode(bc);
} catch (Exception e) {
logger.error("Unable to start Weld-OSGi in Hybrid mode.");
}
} else {
listener = runInHybridMode(bc);
}
}

Expand All @@ -278,18 +290,20 @@ private void runExtensionInHybridMode() {
*/
private HybridListener runInHybridMode(BundleContext bc) {
HybridListener list = new HybridListener(bc, this);
bc.addBundleListener(listener);
bc.addServiceListener(listener);
delegate.setContext(bc);
bc.addBundleListener(list);
bc.addServiceListener(list);
currentContext.set(bc);
currentBundle.set(bc.getBundle().getBundleId());
return list;
}

// @PreDestroy
// void stopExtension() {
// if (listener != null) {
// listener.context.removeBundleListener(listener);
// listener.context.removeServiceListener(listener);
// }
// }
void afterDeployment(@Observes AfterDeploymentValidation event) {
if (listener != null) {
currentContext.remove();
currentBundle.remove();
}
}

private AnnotatedType discoverAndProcessCDIOSGiClass(
AnnotatedType annotatedType) {
Expand Down Expand Up @@ -564,4 +578,114 @@ private void fireAllBundleEvent(AbstractBundleEvent event) {
}
}
}

private static class BundleContextDelegate implements BundleContext {

private BundleContext context;

public void setContext(BundleContext context) {
System.out.println("setup delegate context : " + context);
this.context = context;
}

public String toString() {
return context.toString();
}

public int hashCode() {
return context.hashCode();
}

public boolean equals(Object obj) {
return context.equals(obj);
}

public boolean ungetService(ServiceReference reference) {
return context.ungetService(reference);
}

public void removeServiceListener(ServiceListener listener) {
context.removeServiceListener(listener);
}

public void removeFrameworkListener(FrameworkListener listener) {
context.removeFrameworkListener(listener);
}

public void removeBundleListener(BundleListener listener) {
context.removeBundleListener(listener);
}

public ServiceRegistration registerService(String clazz, Object service, Dictionary properties) {
return context.registerService(clazz, service, properties);
}

public ServiceRegistration registerService(String[] clazzes, Object service, Dictionary properties) {
return context.registerService(clazzes, service, properties);
}

public Bundle installBundle(String location) throws BundleException {
return context.installBundle(location);
}

public Bundle installBundle(String location, InputStream input) throws BundleException {
return context.installBundle(location, input);
}

public ServiceReference[] getServiceReferences(String clazz, String filter) throws InvalidSyntaxException {
return context.getServiceReferences(clazz, filter);
}

public ServiceReference getServiceReference(String clazz) {
return context.getServiceReference(clazz);
}

public Object getService(ServiceReference reference) {
return context.getService(reference);
}

public String getProperty(String key) {
return context.getProperty(key);
}

public File getDataFile(String filename) {
return context.getDataFile(filename);
}

public Bundle[] getBundles() {
return context.getBundles();
}

public Bundle getBundle(long id) {
return context.getBundle(id);
}

public Bundle getBundle() {
return context.getBundle();
}

public ServiceReference[] getAllServiceReferences(String clazz, String filter) throws InvalidSyntaxException {
return context.getAllServiceReferences(clazz, filter);
}

public org.osgi.framework.Filter createFilter(String filter) throws InvalidSyntaxException {
return context.createFilter(filter);
}

public void addServiceListener(ServiceListener listener) {
context.addServiceListener(listener);
}

public void addServiceListener(ServiceListener listener, String filter) throws InvalidSyntaxException {
context.addServiceListener(listener, filter);
}

public void addFrameworkListener(FrameworkListener listener) {
context.addFrameworkListener(listener);
}

public void addBundleListener(BundleListener listener) {
context.addBundleListener(listener);
}
}
}

0 comments on commit eaea70a

Please sign in to comment.