PAXCDI-186 Implicit bean archive support

Using XBean AnnotationFinder to scan for bean-defining annotation.

New interfaces to abstract from provider specific XML parser
and XML models.

Author: hwellmann

itest/src/it/itest-standalone/src/test/java/org/ops4j/pax/cdi/test/BeanScannerTest.java

@@ -17,7 +17,6 @@
  */
 package org.ops4j.pax.cdi.test;
 
-import static org.hamcrest.CoreMatchers.hasItem;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.notNullValue;
 import static org.junit.Assert.assertThat;
@@ -26,13 +25,18 @@
 import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
 import static org.ops4j.pax.exam.CoreOptions.options;
 
+import java.net.URL;
 import java.util.Set;
 
 import javax.inject.Inject;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.ops4j.pax.cdi.spi.scan.BeanDescriptor;
+import org.ops4j.pax.cdi.spi.scan.BeanDescriptorParser;
+import org.ops4j.pax.cdi.spi.scan.BeanDiscoveryMode;
 import org.ops4j.pax.cdi.spi.scan.BeanScanner;
+import org.ops4j.pax.cdi.spi.scan.DefaultBeanDescriptor;
 import org.ops4j.pax.exam.Configuration;
 import org.ops4j.pax.exam.Option;
 import org.ops4j.pax.exam.junit.PaxExam;
@@ -61,22 +65,29 @@ public Option[] config() {
             workspaceBundle("org.ops4j.pax.cdi", "pax-cdi-spi"),
 
             mavenBundle("org.apache.xbean", "xbean-bundleutils").versionAsInProject(),
+            mavenBundle("org.apache.xbean", "xbean-finder-shaded").versionAsInProject(),
+            mavenBundle("org.apache.xbean", "xbean-asm5-shaded").versionAsInProject(),
             mavenBundle("javax.interceptor", "javax.interceptor-api", "1.2"),
             mavenBundle("javax.el", "javax.el-api", "3.0.0"),
             mavenBundle("javax.enterprise", "cdi-api").versionAsInProject());
     }
 
     @Test
-    public void checkBeanCandidateFromEmbeddedJar() {
+    public void archiveWithoutExtenderShouldBeEmpty() {
         Bundle bundle = BundleUtils.getBundle(bc, "org.ops4j.pax.tinybundles");
         assertThat(bundle, is(notNullValue()));
 
-        BeanScanner scanner = new BeanScanner(bundle);
+        BeanDescriptorParser parser = new BeanDescriptorParser() {
+
+            @Override
+            public BeanDescriptor parse(URL beansXml) {
+                return new DefaultBeanDescriptor(null, BeanDiscoveryMode.ALL, "1.0");
+            }
+        };
+
+        BeanScanner scanner = new BeanScanner(bundle, parser);
         scanner.scan();
         Set<String> beanClasses = scanner.getBeanClasses();
-
-        // check we can see a class from an embedded JAR
-        assertThat(beanClasses, hasItem("org.ops4j.store.StoreFactory"));
+        assertThat(beanClasses.size(), is(0));
     }
-
 }

itest/src/it/itest-standalone/src/test/java/org/ops4j/pax/cdi/test/BundleArchiveTest.java

@@ -0,0 +1,118 @@
+/*
+ * Copyright 2015 Harald Wellmann.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied.
+ *
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.ops4j.pax.cdi.test;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.junit.Assert.assertThat;
+import static org.ops4j.pax.cdi.test.support.TestConfiguration.regressionDefaults;
+import static org.ops4j.pax.cdi.test.support.TestConfiguration.workspaceBundle;
+import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
+import static org.ops4j.pax.exam.CoreOptions.options;
+
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.inject.Inject;
+
+import org.apache.xbean.finder.AnnotationFinder;
+import org.apache.xbean.finder.archive.Archive.Entry;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.ops4j.pax.cdi.api.OsgiServiceProvider;
+import org.ops4j.pax.cdi.spi.scan.BundleArchive;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.Option;
+import org.ops4j.pax.exam.junit.PaxExam;
+import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
+import org.ops4j.pax.exam.spi.reactors.PerClass;
+import org.ops4j.pax.swissbox.core.BundleUtils;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+
+@RunWith(PaxExam.class)
+@ExamReactorStrategy(PerClass.class)
+public class BundleArchiveTest {
+
+    @Inject
+    private BundleContext bc;
+
+    @Configuration
+    public Option[] config() {
+        return options(
+            regressionDefaults(),
+
+            // This is a bundle with embedded JARs on the bundle classpath
+            mavenBundle("org.ops4j.pax.tinybundles", "tinybundles", "1.0.0"),
+
+            workspaceBundle("org.ops4j.pax.cdi", "pax-cdi-api"),
+            workspaceBundle("org.ops4j.pax.cdi", "pax-cdi-spi"),
+            workspaceBundle("org.ops4j.pax.cdi", "pax-cdi-extender"),
+            workspaceBundle("org.ops4j.pax.cdi", "pax-cdi-extension"),
+            workspaceBundle("org.ops4j.pax.cdi.samples", "pax-cdi-sample6"),
+            workspaceBundle("org.ops4j.pax.cdi.samples", "pax-cdi-sample1"),
+            workspaceBundle("org.ops4j.pax.cdi.samples", "pax-cdi-sample1-client"),
+
+            mavenBundle("org.apache.xbean", "xbean-bundleutils").versionAsInProject(),
+            mavenBundle("org.apache.xbean", "xbean-finder-shaded").versionAsInProject(),
+            mavenBundle("org.apache.xbean", "xbean-asm5-shaded").versionAsInProject(),
+            mavenBundle("javax.annotation", "javax.annotation-api", "1.2"),
+            mavenBundle("javax.interceptor", "javax.interceptor-api", "1.2"),
+            mavenBundle("javax.el", "javax.el-api", "3.0.0"),
+            mavenBundle("javax.enterprise", "cdi-api").versionAsInProject());
+    }
+
+    @Test
+    public void shouldFindClassFromEmbeddedJar() throws ClassNotFoundException, IOException {
+        Bundle bundle = BundleUtils.getBundle(bc, "org.ops4j.pax.tinybundles");
+        assertThat(bundle, is(notNullValue()));
+
+        BundleArchive archive = new BundleArchive(bundle);
+        Iterator<Entry> it = archive.iterator();
+        while (it.hasNext()) {
+            String className = it.next().getName();
+            System.out.println(className);
+            assertThat(archive.getBytecode(className), is(notNullValue()));
+        }
+    }
+
+    @Test
+    public void shouldFindClassFromImportedPackage() throws ClassNotFoundException, IOException {
+        Bundle bundle = BundleUtils.getBundle(bc, "org.ops4j.pax.cdi.spi");
+        assertThat(bundle, is(notNullValue()));
+
+        BundleArchive archive = new BundleArchive(bundle);
+        Iterator<Entry> it = archive.iterator();
+        while (it.hasNext()) {
+            System.out.println(it.next().getName());
+        }
+    }
+
+    @Test
+    public void shouldFindAnnotations() {
+        Bundle bundle = BundleUtils.getBundle(bc, "org.ops4j.pax.cdi.sample1.client");
+        assertThat(bundle, is(notNullValue()));
+
+        BundleArchive archive = new BundleArchive(bundle);
+        AnnotationFinder finder = new AnnotationFinder(archive);
+        List<Class<?>> classes = finder.findAnnotatedClasses(OsgiServiceProvider.class);
+        System.out.println(classes);
+        assertThat(classes.size(), is(3));
+    }
+}

itest/src/it/itest-standalone/src/test/java/org/ops4j/pax/cdi/test/SecurityTest.java

@@ -23,7 +23,6 @@
 import static org.ops4j.pax.cdi.test.support.TestConfiguration.workspaceBundle;
 import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
 import static org.ops4j.pax.exam.CoreOptions.options;
-import static org.ops4j.pax.exam.CoreOptions.wrappedBundle;
 
 import javax.inject.Inject;
 
@@ -62,22 +61,21 @@ public Option[] config() {
             mavenBundle("org.apache.deltaspike.core", "deltaspike-core-api").versionAsInProject(),
             mavenBundle("org.apache.deltaspike.core", "deltaspike-core-impl").versionAsInProject(),
 
-            // Uncomment this section and delete the next after upgrading to DS 1.4.2
-            // mavenBundle("org.apache.deltaspike.modules", "deltaspike-security-module-api").versionAsInProject(),
-            // mavenBundle("org.apache.deltaspike.modules", "deltaspike-security-module-impl").versionAsInProject(),
+            mavenBundle("org.apache.deltaspike.modules", "deltaspike-security-module-api").versionAsInProject(),
+            mavenBundle("org.apache.deltaspike.modules", "deltaspike-security-module-impl").versionAsInProject(),
 
-            wrappedBundle(mavenBundle("org.apache.deltaspike.modules", "deltaspike-security-module-api")
-                .versionAsInProject())
-                .instructions(
-                    "overwrite=merge",
-                    "Bundle-SymbolicName=org.apache.deltaspike.modules.deltaspike-security-module-api"),
-            wrappedBundle(mavenBundle("org.apache.deltaspike.modules", "deltaspike-security-module-impl").versionAsInProject())
-                .instructions(
-                    "overwrite=merge",
-                    "Bundle-SymbolicName=org.apache.deltaspike.modules.deltaspike-security-module-impl",
-                    "Provide-Capability=org.ops4j.pax.cdi.extension;extension=\"deltaspike-security-module-impl\"",
-                    "Require-Capability=org.ops4j.pax.cdi.extension; filter:=\"(extension=pax-cdi-extension)\", "
-                    + "osgi.extender; filter:=\"(osgi.extender=pax.cdi)\""),
+//            wrappedBundle(mavenBundle("org.apache.deltaspike.modules", "deltaspike-security-module-api")
+//                .versionAsInProject())
+//                .instructions(
+//                    "overwrite=merge",
+//                    "Bundle-SymbolicName=org.apache.deltaspike.modules.deltaspike-security-module-api"),
+//            wrappedBundle(mavenBundle("org.apache.deltaspike.modules", "deltaspike-security-module-impl").versionAsInProject())
+//                .instructions(
+//                    "overwrite=merge",
+//                    "Bundle-SymbolicName=org.apache.deltaspike.modules.deltaspike-security-module-impl",
+//                    "Provide-Capability=org.ops4j.pax.cdi.extension;extension=\"deltaspike-security-module-impl\"",
+//                    "Require-Capability=org.ops4j.pax.cdi.extension; filter:=\"(extension=pax-cdi-extension)\", "
+//                    + "osgi.extender; filter:=\"(osgi.extender=pax.cdi)\""),
 
             // Sample bundles
             workspaceBundle("org.ops4j.pax.cdi.samples", "pax-cdi-sample8"));

pax-cdi-openwebbeans/src/main/java/org/ops4j/pax/cdi/openwebbeans/impl/BundleScannerService.java

@@ -18,11 +18,11 @@
 package org.ops4j.pax.cdi.openwebbeans.impl;
 
 import java.net.URL;
-import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Map;
 import java.util.Set;
 
+import org.apache.webbeans.config.WebBeansContext;
+import org.apache.webbeans.spi.BeanArchiveService;
 import org.apache.webbeans.spi.ScannerService;
 import org.apache.xbean.osgi.bundle.util.BundleUtils;
 import org.ops4j.pax.cdi.spi.scan.BeanScanner;
@@ -43,14 +43,6 @@ public class BundleScannerService implements ScannerService {
     private BeanScanner scanner;
     private Bundle bundle;
     private Set<Class<?>> beanClasses;
-    private Map<String, Set<String>> classAnnotations;
-
-    /**
-     * Creates a new scanner service.
-     */
-    public BundleScannerService() {
-        classAnnotations = new HashMap<String, Set<String>>();
-    }
 
     @Override
     public void init(Object object) {
@@ -59,8 +51,10 @@ public void init(Object object) {
 
     @Override
     public void scan() {
+        BeanArchiveService archiveService = WebBeansContext.getInstance().getBeanArchiveService();
+        OpenWebBeansParser parser = new OpenWebBeansParser(archiveService);
         bundle = BundleUtils.getContextBundle(true);
-        scanner = new BeanScanner(bundle);
+        scanner = new BeanScanner(bundle, parser);
         scanner.scan();
     }
 
@@ -69,7 +63,6 @@ public void release() {
         scanner = null;
         bundle = null;
         beanClasses = null;
-        classAnnotations.clear();
     }
 
     @Override

pax-cdi-openwebbeans/src/main/java/org/ops4j/pax/cdi/openwebbeans/impl/OpenWebBeansParser.java

@@ -0,0 +1,110 @@
+/*
+ * Copyright 2015 Harald Wellmann.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied.
+ *
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.ops4j.pax.cdi.openwebbeans.impl;
+
+import java.net.URL;
+import java.util.List;
+
+import org.apache.webbeans.spi.BeanArchiveService;
+import org.apache.webbeans.spi.BeanArchiveService.BeanArchiveInformation;
+import org.ops4j.pax.cdi.spi.scan.BeanDescriptor;
+import org.ops4j.pax.cdi.spi.scan.BeanDescriptorParser;
+import org.ops4j.pax.cdi.spi.scan.BeanDiscoveryMode;
+
+
+public class OpenWebBeansParser implements BeanDescriptorParser {
+
+
+    private BeanArchiveService archiveService;
+    private BeanArchiveInformation archiveInfo;
+
+    private class BeanDescriptorImpl implements BeanDescriptor {
+
+
+        private URL url;
+
+        public BeanDescriptorImpl(URL url) {
+            this.url = url;
+        }
+
+        @Override
+        public String getVersion() {
+            return archiveInfo.getVersion();
+        }
+
+        @Override
+        public BeanDiscoveryMode getBeanDiscoveryMode() {
+            return BeanDiscoveryMode.valueOf(archiveInfo.getBeanDiscoveryMode().toString());
+        }
+
+        @Override
+        public boolean isClassExcluded(String clazz) {
+            return archiveInfo.isClassExcluded(clazz);
+        }
+
+        @Override
+        public boolean isPackageExcluded(String packageName) {
+            return archiveInfo.isPackageExcluded(packageName);
+        }
+
+        @Override
+        public List<String> getInterceptors() {
+            return archiveInfo.getInterceptors();
+        }
+
+        @Override
+        public List<String> getDecorators() {
+            return archiveInfo.getDecorators();
+        }
+
+        @Override
+        public List<String> getAlternativeClasses() {
+            return archiveInfo.getAlternativeClasses();
+        }
+
+        @Override
+        public List<String> getAlternativeStereotypes() {
+            return archiveInfo.getAlternativeStereotypes();
+        }
+
+        @Override
+        public List<String> getExcludedClasses() {
+            return archiveInfo.getExcludedClasses();
+        }
+
+        @Override
+        public List<String> getExcludedPackages() {
+            return archiveInfo.getExcludedPackages();
+        }
+
+        @Override
+        public URL getUrl() {
+            return url;
+        }
+    }
+
+    public OpenWebBeansParser(BeanArchiveService archiveService) {
+        this.archiveService = archiveService;
+    }
+
+    @Override
+    public BeanDescriptor parse(URL beansXml) {
+        archiveInfo = archiveService.getBeanArchiveInformation(beansXml);
+        return new BeanDescriptorImpl(beansXml);
+    }
+}