Migrating to weld 1.1; bumping version to 1.0.1-SNAPSHOT

adamw · Oct 14, 2010 · 42d82c9 · 42d82c9
1 parent 9f9c8cf
commit 42d82c9
Show file tree

Hide file tree

Showing 15 changed files with 91 additions and 74 deletions.
diff --git a/cdi/pom.xml b/cdi/pom.xml
@@ -6,12 +6,12 @@
     <artifactId>cdiext-cdi</artifactId>
     <packaging>jar</packaging>
     <name>CDI/Weld extensions</name>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.0.1-SNAPSHOT</version>
 
     <parent>
         <groupId>pl.softwaremill.cdiext</groupId>
         <artifactId>cdiext-main</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.0.1-SNAPSHOT</version>
     </parent>
 
     <dependencies>
@@ -59,7 +59,17 @@
             <scope>provided</scope>
         </dependency>
 
-        <!-- Hibernate -->
+        <!-- JEE and Hibernate -->
+        <dependency>
+            <groupId>org.jboss.spec</groupId>
+            <artifactId>jboss-javaee-6.0</artifactId>
+            <type>pom</type>
+        </dependency>
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-validator</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-core</artifactId>
@@ -75,11 +85,17 @@
             <artifactId>hibernate-entitymanager</artifactId>
             <scope>provided</scope>
         </dependency>
-        
+
         <!-- Weld extensions -->
         <dependency>
             <groupId>org.jboss.weld</groupId>
             <artifactId>weld-extensions</artifactId>
+        </dependency> 
+        <dependency>
+            <groupId>org.jboss.logging</groupId>
+            <artifactId>jboss-logging</artifactId>
+            <scope>provided</scope>
+            <version>3.0.0.Beta4</version>
         </dependency>
 
         <!-- Debug -->
@@ -97,7 +113,7 @@
         </dependency>
         <dependency>
             <groupId>org.jboss.arquillian.container</groupId>
-            <artifactId>arquillian-weld-embedded</artifactId>
+            <artifactId>arquillian-weld-ee-embedded-1.1</artifactId>
             <scope>test</scope>
         </dependency>
 

diff --git a/cdi/src/main/java/pl/softwaremill/cdiext/security/SecurityExtension.java b/cdi/src/main/java/pl/softwaremill/cdiext/security/SecurityExtension.java
@@ -1,6 +1,6 @@
 package pl.softwaremill.cdiext.security;
 
-import org.jboss.weld.extensions.util.annotated.NewAnnotatedTypeBuilder;
+import org.jboss.weld.extensions.reflection.annotated.AnnotatedTypeBuilder;
 
 import javax.enterprise.event.Observes;
 import javax.enterprise.inject.spi.AnnotatedMethod;
@@ -27,7 +27,7 @@ public InterceptSecure getInterceptSecure(Method m) {
     public <T> void processAnnotatedType(@Observes ProcessAnnotatedType<T> event) {
         // A flag indicating if the builder was used to modify the annotations
         boolean used = false;
-        NewAnnotatedTypeBuilder<T> builder = new NewAnnotatedTypeBuilder<T>(event.getAnnotatedType());
+        AnnotatedTypeBuilder<T> builder = new AnnotatedTypeBuilder<T>().readFromType(event.getAnnotatedType());
 
         // We need to read the values of the @Secure annotation that are present on:
         // 1. types (classes)

diff --git a/cdi/src/test/java/pl/softwaremill/cdiext/el/ELEvaluatorTest.java b/cdi/src/test/java/pl/softwaremill/cdiext/el/ELEvaluatorTest.java
@@ -2,7 +2,7 @@
 
 import org.jboss.arquillian.api.Deployment;
 import org.jboss.arquillian.testng.Arquillian;
-import org.jboss.shrinkwrap.api.Archives;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.testng.Assert;
 import org.testng.annotations.Test;
@@ -21,7 +21,7 @@ public class ELEvaluatorTest extends Arquillian {
 
     @Deployment
     public static JavaArchive createTestArchive() {
-        JavaArchive ar = Archives.create("test.jar", JavaArchive.class)
+        JavaArchive ar = ShrinkWrap.create(JavaArchive.class, "test.jar")
                 .addClasses(StringHoldingBean.class)
                 .addPackage(ELEvaluator.class.getPackage());
 

diff --git a/cdi/src/test/java/pl/softwaremill/cdiext/objectservice/BasicObjectServiceTest.java b/cdi/src/test/java/pl/softwaremill/cdiext/objectservice/BasicObjectServiceTest.java
@@ -2,7 +2,7 @@
 
 import org.jboss.arquillian.api.Deployment;
 import org.jboss.arquillian.testng.Arquillian;
-import org.jboss.shrinkwrap.api.Archives;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.testng.Assert;
 import org.testng.annotations.Test;
@@ -17,7 +17,7 @@
 public class BasicObjectServiceTest extends Arquillian {
     @Deployment
     public static JavaArchive createTestArchive() {
-        JavaArchive ar = Archives.create("test.jar", JavaArchive.class)
+        JavaArchive ar = ShrinkWrap.create(JavaArchive.class, "test.jar")
                 .addPackage(A.class.getPackage())
                 .addPackage(OS.class.getPackage())
                 .addPackage(ObjectServiceExtension.class.getPackage());

diff --git a/cdi/src/test/java/pl/softwaremill/cdiext/persistence/AbstractHibernateTest.java b/cdi/src/test/java/pl/softwaremill/cdiext/persistence/AbstractHibernateTest.java
@@ -1,17 +1,10 @@
 package pl.softwaremill.cdiext.persistence;
 
 import org.hibernate.ejb.Ejb3Configuration;
-import org.jboss.arquillian.api.Deployment;
 import org.jboss.arquillian.testng.Arquillian;
-import org.jboss.shrinkwrap.api.Archives;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.testng.Assert;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-import pl.softwaremill.cdiext.util.ArquillianUtil;
 
-import javax.inject.Inject;
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
 import java.io.IOException;

diff --git a/cdi/src/test/java/pl/softwaremill/cdiext/persistence/EntityManagerUtilTest.java b/cdi/src/test/java/pl/softwaremill/cdiext/persistence/EntityManagerUtilTest.java
@@ -2,7 +2,7 @@
 
 import org.hibernate.ejb.Ejb3Configuration;
 import org.jboss.arquillian.api.Deployment;
-import org.jboss.shrinkwrap.api.Archives;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.testng.Assert;
 import org.testng.annotations.Test;
@@ -21,7 +21,7 @@ protected void configure(Ejb3Configuration cfg) {
 
     @Deployment
     public static JavaArchive createTestArchive() {
-        JavaArchive ar = Archives.create("test.jar", JavaArchive.class);
+        JavaArchive ar = ShrinkWrap.create(JavaArchive.class, "test.jar");
         ar = ArquillianUtil.addEmptyBeansXml(ar);
 
         return ar;

diff --git a/cdi/src/test/java/pl/softwaremill/cdiext/persistence/EntityWriterTest.java b/cdi/src/test/java/pl/softwaremill/cdiext/persistence/EntityWriterTest.java
@@ -2,7 +2,7 @@
 
 import org.hibernate.ejb.Ejb3Configuration;
 import org.jboss.arquillian.api.Deployment;
-import org.jboss.shrinkwrap.api.Archives;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.testng.Assert;
 import org.testng.annotations.Test;
@@ -27,7 +27,7 @@ protected void configure(Ejb3Configuration cfg) {
 
     @Deployment
     public static JavaArchive createTestArchive() {
-        JavaArchive ar = Archives.create("test.jar", JavaArchive.class)
+        JavaArchive ar = ShrinkWrap.create(JavaArchive.class, "test.jar")
                 .addClass(EntityWriter.class)
                 .addClass(MockEntityManagerProducers.class);
 

diff --git a/cdi/src/test/java/pl/softwaremill/cdiext/security/AllowWithFlagTest.java b/cdi/src/test/java/pl/softwaremill/cdiext/security/AllowWithFlagTest.java
@@ -2,7 +2,7 @@
 
 import org.jboss.arquillian.api.Deployment;
 import org.jboss.arquillian.testng.Arquillian;
-import org.jboss.shrinkwrap.api.Archives;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.testng.annotations.Test;
 import pl.softwaremill.cdiext.el.ELEvaluator;
@@ -17,7 +17,7 @@
 public class AllowWithFlagTest extends Arquillian {
     @Deployment
     public static JavaArchive createTestArchive() {
-        JavaArchive ar = Archives.create("test.jar", JavaArchive.class)
+        JavaArchive ar = ShrinkWrap.create(JavaArchive.class, "test.jar")
                 .addPackage(AllowWithFlagTest.class.getPackage())
                 .addPackage(Secure.class.getPackage())
                 .addPackage(ELEvaluator.class.getPackage());

diff --git a/cdi/src/test/java/pl/softwaremill/cdiext/security/SecureResultTest.java b/cdi/src/test/java/pl/softwaremill/cdiext/security/SecureResultTest.java
@@ -2,7 +2,7 @@
 
 import org.jboss.arquillian.api.Deployment;
 import org.jboss.arquillian.testng.Arquillian;
-import org.jboss.shrinkwrap.api.Archives;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.testng.annotations.Test;
 import pl.softwaremill.cdiext.el.ELEvaluator;
@@ -16,7 +16,7 @@
 public class SecureResultTest extends Arquillian {
     @Deployment
     public static JavaArchive createTestArchive() {
-        JavaArchive ar = Archives.create("test.jar", JavaArchive.class)
+        JavaArchive ar = ShrinkWrap.create(JavaArchive.class, "test.jar")
                 .addPackage(SecureResultTest.class.getPackage())
                 .addPackage(SecureResult.class.getPackage())
                 .addPackage(ELEvaluator.class.getPackage());
@@ -39,4 +39,4 @@ public void testDirectSecurePass() {
     public void testDirectSecureFail() {
         secureResultBean.method1("b");
     }
-}
+}
diff --git a/cdi/src/test/java/pl/softwaremill/cdiext/security/SecureTest.java b/cdi/src/test/java/pl/softwaremill/cdiext/security/SecureTest.java
@@ -2,7 +2,7 @@
 
 import org.jboss.arquillian.api.Deployment;
 import org.jboss.arquillian.testng.Arquillian;
-import org.jboss.shrinkwrap.api.Archives;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.testng.annotations.Test;
 import pl.softwaremill.cdiext.el.ELEvaluator;
@@ -16,7 +16,7 @@
 public class SecureTest extends Arquillian {
     @Deployment
     public static JavaArchive createTestArchive() {
-        JavaArchive ar = Archives.create("test.jar", JavaArchive.class)
+        JavaArchive ar = ShrinkWrap.create(JavaArchive.class, "test.jar")
                 .addPackage(SecureTest.class.getPackage())
                 .addPackage(Secure.class.getPackage())
                 .addPackage(ELEvaluator.class.getPackage());

diff --git a/cdi/src/test/java/pl/softwaremill/cdiext/util/ArquillianUtil.java b/cdi/src/test/java/pl/softwaremill/cdiext/util/ArquillianUtil.java
@@ -2,9 +2,9 @@
 
 import org.jboss.shrinkwrap.api.Archive;
 import org.jboss.shrinkwrap.api.ArchivePaths;
+import org.jboss.shrinkwrap.api.asset.ByteArrayAsset;
 import org.jboss.shrinkwrap.api.container.ManifestContainer;
 import org.jboss.shrinkwrap.api.container.ResourceContainer;
-import org.jboss.shrinkwrap.impl.base.asset.ByteArrayAsset;
 
 /**
  * @author Adam Warski (adam at warski dot org)
@@ -13,15 +13,31 @@ public class ArquillianUtil {
     public static <T extends Archive<T> & ManifestContainer<T>> T addEmptyBeansXml(T archive) {
         return archive.addManifestResource(
                         new ByteArrayAsset("<beans/>".getBytes()),
-                        ArchivePaths.create("beans.xml"));
+                        ArchivePaths.create("META-INF/beans.xml"));
     }
 
     public static <T extends Archive<T> & ResourceContainer<T>> T addTestBeansXml(T archive) {
-        // TODO: use the same as in the app?
-        return archive.addResource("beans.xml");
+        StringBuilder beansXmlBuilder = new StringBuilder();
+        beansXmlBuilder.append("<beans>");
+        beansXmlBuilder.append("<interceptors>");
+        beansXmlBuilder.append("<class>pl.softwaremill.cdiext.security.SecurityInterceptor</class>");
+        beansXmlBuilder.append("<class>pl.softwaremill.cdiext.security.SecurityResultInterceptor</class>");
+        beansXmlBuilder.append("</interceptors>");
+        beansXmlBuilder.append("</beans>");
+
+        return archive.addResource(
+                new ByteArrayAsset(beansXmlBuilder.toString().getBytes()),
+                ArchivePaths.create("META-INF/beans.xml"));
     }
 
     public static <T extends Archive<T> & ResourceContainer<T>> T addExtensionsFromApp(T archive) {
-        return archive.addResource("META-INF/services/javax.enterprise.inject.spi.Extension");
+        StringBuilder extensionsBuilder = new StringBuilder();
+        extensionsBuilder.append("pl.softwaremill.cdiext.security.SecurityExtension");
+        extensionsBuilder.append("pl.softwaremill.cdiext.config.ConfigExtension");
+        extensionsBuilder.append("pl.softwaremill.cdiext.objectservice.extension.ObjectServiceExtension");
+
+        return archive.addResource(
+                new ByteArrayAsset(extensionsBuilder.toString().getBytes()),
+                ArchivePaths.create("META-INF/services/javax.enterprise.inject.spi.Extension"));
     }
 }
diff --git a/cdi/src/test/resources/beans.xml b/cdi/src/test/resources/beans.xml
diff --git a/common/pom.xml b/common/pom.xml
@@ -6,12 +6,12 @@
     <artifactId>cdiext-common</artifactId>
     <packaging>jar</packaging>
     <name>Common classes</name>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.0.1-SNAPSHOT</version>
 
     <parent>
         <groupId>pl.softwaremill.cdiext</groupId>
         <artifactId>cdiext-main</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.0.1-SNAPSHOT</version>
     </parent>
 
     <dependencies>

diff --git a/faces/pom.xml b/faces/pom.xml
@@ -6,12 +6,12 @@
     <artifactId>cdiext-faces</artifactId>
     <packaging>jar</packaging>
     <name>Faces extensions</name>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.0.1-SNAPSHOT</version>
 
     <parent>
         <groupId>pl.softwaremill.cdiext</groupId>
         <artifactId>cdiext-main</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.0.1-SNAPSHOT</version>
     </parent>
 
     <dependencies>