Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ClientModule.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ClientModule.java?rev=950412&r1=950411&r2=950412&view=diff ============================================================================== --- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ClientModule.java (original) +++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ClientModule.java Wed Jun 2 08:01:03 2010 @@ -17,6 +17,7 @@ package org.apache.openejb.config; import org.apache.openejb.jee.ApplicationClient; +import org.apache.xbean.finder.AbstractFinder; import org.apache.xbean.finder.ClassFinder; import java.util.Map; @@ -37,7 +38,7 @@ public class ClientModule implements Dep private ClassLoader classLoader; private String mainClass; private boolean ejbModuleGenerated; - private AtomicReference<ClassFinder> finder; + private AtomicReference<AbstractFinder> finder; private final Set<String> localClients = new HashSet<String>(); private final Set<String> remoteClients = new HashSet<String>(); private final Map<String,Object> altDDs = new HashMap<String,Object>(); @@ -71,15 +72,15 @@ public class ClientModule implements Dep this.ejbModuleGenerated = ejbModuleGenerated; } - public ClassFinder getFinder() { + public AbstractFinder getFinder() { return (finder != null)? finder.get(): null; } - public void setFinderReference(AtomicReference<ClassFinder> finder) { + public void setFinderReference(AtomicReference<AbstractFinder> finder) { this.finder = finder; } - public AtomicReference<ClassFinder> getFinderReference() { + public AtomicReference<AbstractFinder> getFinderReference() { return this.finder; }
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java?rev=950412&r1=950411&r2=950412&view=diff ============================================================================== --- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java (original) +++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java Wed Jun 2 08:01:03 2010 @@ -132,7 +132,11 @@ public class ConfigurationFactory implem chain.add(new ReadDescriptors()); - chain.add(new AnnotationDeployer()); + if (System.getProperty(DUCT_TAPE_PROPERTY) == null) { + chain.add(new AnnotationDeployer()); + } else { + chain.add(new BundleAnnotationDeployer()); + } chain.add(new GeneratedClientModules.Prune()); Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/EjbModule.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/EjbModule.java?rev=950412&r1=950411&r2=950412&view=diff ============================================================================== --- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/EjbModule.java (original) +++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/EjbModule.java Wed Jun 2 08:01:03 2010 @@ -20,6 +20,7 @@ package org.apache.openejb.config; import org.apache.openejb.jee.EjbJar; import org.apache.openejb.jee.Webservices; import org.apache.openejb.jee.oejb3.OpenejbJar; +import org.apache.xbean.finder.AbstractFinder; import org.apache.xbean.finder.ClassFinder; import java.io.File; @@ -44,7 +45,7 @@ public class EjbModule implements WsModu private OpenejbJar openejbJar; private Webservices webservices; private String moduleId; - private final AtomicReference<ClassFinder> finder = new AtomicReference<ClassFinder>(); + private final AtomicReference<AbstractFinder> finder = new AtomicReference<AbstractFinder>(); private final Map<String,Object> altDDs = new HashMap<String,Object>(); private final Set<String> watchedResources = new TreeSet<String>(); @@ -96,11 +97,11 @@ public class EjbModule implements WsModu this(classLoader, null, jarURI, ejbJar, openejbJar); } - public ClassFinder getFinder() { + public AbstractFinder getFinder() { return (finder != null)? finder.get(): null; } - public AtomicReference<ClassFinder> getFinderReference() { + public AtomicReference<AbstractFinder> getFinderReference() { return this.finder; } Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/WebModule.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/WebModule.java?rev=950412&r1=950411&r2=950412&view=diff ============================================================================== --- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/WebModule.java (original) +++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/WebModule.java Wed Jun 2 08:01:03 2010 @@ -29,6 +29,7 @@ import org.apache.openejb.jee.FacesConfi import org.apache.openejb.jee.TldTaglib; import org.apache.openejb.jee.WebApp; import org.apache.openejb.jee.Webservices; +import org.apache.xbean.finder.AbstractFinder; import org.apache.xbean.finder.ClassFinder; /** @@ -49,7 +50,7 @@ public class WebModule implements WsModu private final Set<String> watchedResources = new TreeSet<String>(); // List of all faces configuration files found in this web module private final List<FacesConfig> facesConfigs = new ArrayList<FacesConfig>(); - private ClassFinder finder; + private AbstractFinder finder; public WebModule(WebApp webApp, String contextRoot, ClassLoader classLoader, String jarLocation, String moduleId) { @@ -86,11 +87,11 @@ public class WebModule implements WsModu validation = new ValidationContext(WebModule.class, jarLocation); } - public ClassFinder getFinder() { + public AbstractFinder getFinder() { return finder; } - public void setFinder(ClassFinder finder) { + public void setFinder(AbstractFinder finder) { this.finder = finder; }
