[jboss-svn-commits] JBoss Common SVN: r4279 - in arquillian/trunk: containers/openwebbeans-embedded/src/main/java/org/jboss/arquillian/openwebbeans and 2 other directories.

[jboss-svn-commits at lists.jboss.org]

Author: aslak
Date: 2010-04-20 19:05:22 -0400 (Tue, 20 Apr 2010)
New Revision: 4279

Modified:
   arquillian/trunk/containers/openwebbeans-embedded/src/main/java/org/jboss/arquillian/openwebbeans/OpenWebBeansSEContainer.java
   arquillian/trunk/containers/openwebbeans-embedded/src/main/java/org/jboss/arquillian/openwebbeans/ShrinkWrapMetaDataDiscovery.java
   arquillian/trunk/containers/pom.xml
   arquillian/trunk/examples/junit/pom.xml
   arquillian/trunk/examples/testng/pom.xml
Log:
ARQ-96 Added OpenWebBeans to main build and added examples profile


Modified: arquillian/trunk/containers/openwebbeans-embedded/src/main/java/org/jboss/arquillian/openwebbeans/OpenWebBeansSEContainer.java
===================================================================
--- arquillian/trunk/containers/openwebbeans-embedded/src/main/java/org/jboss/arquillian/openwebbeans/OpenWebBeansSEContainer.java	2010-04-20 22:49:18 UTC (rev 4278)
+++ arquillian/trunk/containers/openwebbeans-embedded/src/main/java/org/jboss/arquillian/openwebbeans/OpenWebBeansSEContainer.java	2010-04-20 23:05:22 UTC (rev 4279)
@@ -22,14 +22,15 @@
 import java.util.Map;
 import java.util.UUID;
 import java.util.logging.Logger;
+
 import javax.enterprise.inject.spi.BeanManager;
 import javax.servlet.ServletContext;
 import javax.servlet.http.HttpSession;
 import javax.servlet.http.HttpSessionContext;
+
 import org.apache.webbeans.context.ContextFactory;
 import org.apache.webbeans.lifecycle.StandaloneLifeCycle;
 import org.apache.webbeans.spi.ContainerLifecycle;
-
 import org.jboss.arquillian.protocol.local.LocalMethodExecutor;
 import org.jboss.arquillian.spi.Configuration;
 import org.jboss.arquillian.spi.ContainerMethodExecutor;

Modified: arquillian/trunk/containers/openwebbeans-embedded/src/main/java/org/jboss/arquillian/openwebbeans/ShrinkWrapMetaDataDiscovery.java
===================================================================
--- arquillian/trunk/containers/openwebbeans-embedded/src/main/java/org/jboss/arquillian/openwebbeans/ShrinkWrapMetaDataDiscovery.java	2010-04-20 22:49:18 UTC (rev 4278)
+++ arquillian/trunk/containers/openwebbeans-embedded/src/main/java/org/jboss/arquillian/openwebbeans/ShrinkWrapMetaDataDiscovery.java	2010-04-20 23:05:22 UTC (rev 4279)
@@ -95,7 +95,7 @@
          Map<ArchivePath, Node> classes = archive.getContent(Filters.include(".*\\.class"));
          for (Map.Entry<ArchivePath, Node> classEntry : classes.entrySet())
          {
-            if (classEntry.getValue() instanceof ClassAsset)
+            if (classEntry.getValue().getAsset() instanceof ClassAsset)
             {
                try
                {

Modified: arquillian/trunk/containers/pom.xml
===================================================================
--- arquillian/trunk/containers/pom.xml	2010-04-20 22:49:18 UTC (rev 4278)
+++ arquillian/trunk/containers/pom.xml	2010-04-20 23:05:22 UTC (rev 4279)
@@ -34,7 +34,7 @@
     <module>weld-embedded</module>
     <module>openejb</module>
     <module>reloaded</module>
-
+    <module>openwebbeans-embedded</module>
   </modules>
 
 </project>

Modified: arquillian/trunk/examples/junit/pom.xml
===================================================================
--- arquillian/trunk/examples/junit/pom.xml	2010-04-20 22:49:18 UTC (rev 4278)
+++ arquillian/trunk/examples/junit/pom.xml	2010-04-20 23:05:22 UTC (rev 4279)
@@ -83,6 +83,36 @@
          </build>
       </profile>
       <profile>
+         <id>openwebbeans-embedded</id>
+         <dependencies>
+            <dependency>
+               <groupId>org.jboss.arquillian.container</groupId>
+               <artifactId>arquillian-openwebbeans-embedded</artifactId>
+               <version>${project.version}</version>
+            </dependency>
+            <dependency> <!-- Need on all profiles except Glassfish to compile, api is not 100% up to date with final spec -->
+               <groupId>org.jboss.ejb3</groupId> 
+               <artifactId>jboss-ejb3-api</artifactId> 
+               <version>3.1.0</version>
+               <scope>test</scope>
+            </dependency>
+         </dependencies>
+         <build>
+            <plugins>
+               <plugin>
+                  <groupId>org.apache.maven.plugins</groupId>
+                  <artifactId>maven-surefire-plugin</artifactId>
+                  <configuration>
+                     <includes>
+                        <include>com/acme/cdi/payment/*</include>
+                        <include>com/acme/cdi/random/*</include>
+                     </includes>
+                  </configuration>
+               </plugin>
+            </plugins>
+         </build>
+      </profile>
+      <profile>
          <id>jbossas-embedded-60</id>
          <dependencies>
             <dependency>
@@ -251,7 +281,7 @@
          <groupId>javax.enterprise</groupId> 
          <artifactId>cdi-api</artifactId> 
          <version>1.0-SP1</version> 
-         <scope>test</scope>
+         <scope>provided</scope>
       </dependency>
       <dependency>
          <groupId>javax.mail</groupId> 
@@ -259,7 +289,7 @@
          <version>1.4.1</version> 
          <scope>test</scope>
       </dependency>
-  
+      
       <dependency>
          <groupId>junit</groupId>
          <artifactId>junit</artifactId>

Modified: arquillian/trunk/examples/testng/pom.xml
===================================================================
--- arquillian/trunk/examples/testng/pom.xml	2010-04-20 22:49:18 UTC (rev 4278)
+++ arquillian/trunk/examples/testng/pom.xml	2010-04-20 23:05:22 UTC (rev 4279)
@@ -84,6 +84,36 @@
          </build>
       </profile>
       <profile>
+         <id>openwebbeans-embedded</id>
+         <dependencies>
+            <dependency>
+               <groupId>org.jboss.arquillian.container</groupId>
+               <artifactId>arquillian-openwebbeans-embedded</artifactId>
+               <version>${project.version}</version>
+            </dependency>
+            <dependency> <!-- Need on all profiles except Glassfish to compile, api is not 100% up to date with final spec -->
+               <groupId>org.jboss.ejb3</groupId> 
+               <artifactId>jboss-ejb3-api</artifactId> 
+               <version>3.1.0</version>
+               <scope>test</scope>
+            </dependency>
+         </dependencies>
+         <build>
+            <plugins>
+               <plugin>
+                  <groupId>org.apache.maven.plugins</groupId>
+                  <artifactId>maven-surefire-plugin</artifactId>
+                  <configuration>
+                     <includes>
+                        <include>com/acme/cdi/payment/*</include>
+                        <include>com/acme/cdi/random/*</include>
+                     </includes>
+                  </configuration>
+               </plugin>
+            </plugins>
+         </build>
+      </profile>
+      <profile>
          <id>jbossas-embedded-60</id>
          <dependencies>
             <dependency>