openwebbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a...@apache.org
Subject svn commit: r1492581 - in /openwebbeans/trunk: webbeans-arquillian/owb-arquillian-standalone/src/main/java/org/apache/webbeans/arquillian/standalone/ webbeans-cdi11/ webbeans-cdi11/src/main/ webbeans-cdi11/src/main/resources/ webbeans-cdi11/src/main/re...
Date Thu, 13 Jun 2013 09:04:40 GMT
Author: arne
Date: Thu Jun 13 09:04:40 2013
New Revision: 1492581

URL: http://svn.apache.org/r1492581
Log:
OWB-846: CDI 1.1 integration

Added:
    openwebbeans/trunk/webbeans-cdi11/src/main/
    openwebbeans/trunk/webbeans-cdi11/src/main/resources/
    openwebbeans/trunk/webbeans-cdi11/src/main/resources/META-INF/
    openwebbeans/trunk/webbeans-cdi11/src/main/resources/META-INF/cdi-tck.properties
    openwebbeans/trunk/webbeans-cdi11/src/test/
    openwebbeans/trunk/webbeans-cdi11/src/test/java/
    openwebbeans/trunk/webbeans-cdi11/src/test/resources/
Modified:
    openwebbeans/trunk/webbeans-arquillian/owb-arquillian-standalone/src/main/java/org/apache/webbeans/arquillian/standalone/OwbArquillianScannerService.java
    openwebbeans/trunk/webbeans-arquillian/owb-arquillian-standalone/src/main/java/org/apache/webbeans/arquillian/standalone/OwbStandaloneContainer.java
    openwebbeans/trunk/webbeans-cdi11/pom.xml
    openwebbeans/trunk/webbeans-cdi11/standalone-suite.xml
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/exception/WebBeansConfigurationException.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/exception/definition/DuplicateDefinitionException.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/impl/InjectionPointImpl.java

Modified: openwebbeans/trunk/webbeans-arquillian/owb-arquillian-standalone/src/main/java/org/apache/webbeans/arquillian/standalone/OwbArquillianScannerService.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-arquillian/owb-arquillian-standalone/src/main/java/org/apache/webbeans/arquillian/standalone/OwbArquillianScannerService.java?rev=1492581&r1=1492580&r2=1492581&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-arquillian/owb-arquillian-standalone/src/main/java/org/apache/webbeans/arquillian/standalone/OwbArquillianScannerService.java
(original)
+++ openwebbeans/trunk/webbeans-arquillian/owb-arquillian-standalone/src/main/java/org/apache/webbeans/arquillian/standalone/OwbArquillianScannerService.java
Thu Jun 13 09:04:40 2013
@@ -134,7 +134,7 @@ public class OwbArquillianScannerService
         URL metainfBeansXmlUrl = getBeanXmlUrl(archive, WEB_INF_CLASS_FOLDER + "META-INF/beans.xml");
         if (metainfBeansXmlUrl != null)
         {
-            beansXmls.add(webBeansXmlUrl);
+            beansXmls.add(metainfBeansXmlUrl);
         }
 
         if (metainfBeansXmlUrl != null || webBeansXmlUrl != null)

Modified: openwebbeans/trunk/webbeans-arquillian/owb-arquillian-standalone/src/main/java/org/apache/webbeans/arquillian/standalone/OwbStandaloneContainer.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-arquillian/owb-arquillian-standalone/src/main/java/org/apache/webbeans/arquillian/standalone/OwbStandaloneContainer.java?rev=1492581&r1=1492580&r2=1492581&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-arquillian/owb-arquillian-standalone/src/main/java/org/apache/webbeans/arquillian/standalone/OwbStandaloneContainer.java
(original)
+++ openwebbeans/trunk/webbeans-arquillian/owb-arquillian-standalone/src/main/java/org/apache/webbeans/arquillian/standalone/OwbStandaloneContainer.java
Thu Jun 13 09:04:40 2013
@@ -24,6 +24,7 @@ import java.util.logging.Logger;
 
 import org.apache.webbeans.config.WebBeansContext;
 import org.apache.webbeans.config.WebBeansFinder;
+import org.apache.webbeans.exception.WebBeansDeploymentException;
 import org.apache.webbeans.spi.ContainerLifecycle;
 import org.jboss.arquillian.container.spi.client.container.DeployableContainer;
 import org.jboss.arquillian.container.spi.client.container.DeploymentException;
@@ -99,7 +100,14 @@ public class OwbStandaloneContainer impl
         OwbArquillianScannerService dummyScannerService = (OwbArquillianScannerService) webBeansContext.getScannerService();
         dummyScannerService.setArchive(archive);
 
-        lifecycle.startApplication(null);
+        try
+        {
+            lifecycle.startApplication(null);
+        }
+        catch (WebBeansDeploymentException e)
+        {
+            throw new DeploymentException(e.getMessage(), e);
+        }
 
         return new ProtocolMetaData();
     }

Modified: openwebbeans/trunk/webbeans-cdi11/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-cdi11/pom.xml?rev=1492581&r1=1492580&r2=1492581&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-cdi11/pom.xml (original)
+++ openwebbeans/trunk/webbeans-cdi11/pom.xml Thu Jun 13 09:04:40 2013
@@ -50,27 +50,34 @@
             <artifactId>xbean-finder-shaded</artifactId>
         </dependency>
 
-<!--X TODO remove
         <dependency>
             <groupId>javax.enterprise</groupId>
             <artifactId>cdi-api</artifactId>
             <version>1.1</version>
-            <optional>true</optional>
+            <scope>provided</scope>
         </dependency>
--->
+<!--         <dependency> -->
+<!--             <groupId>org.apache.geronimo.specs</groupId> -->
+<!--             <artifactId>geronimo-jcdi_1.1_spec</artifactId> -->
+<!--             <optional>true</optional> -->
+<!--             <version>1.0-SNAPSHOT</version> -->
+<!--         </dependency> -->
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jcdi_1.1_spec</artifactId>
-            <optional>true</optional>
+            <artifactId>geronimo-annotation_1.2_spec</artifactId>
+            <version>1.0.MR2-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-ejb_3.2_spec</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-annotation_1.2_spec</artifactId>
-            <version>1.0.MR2-SNAPSHOT</version>
+            <artifactId>geronimo-servlet_3.0_spec</artifactId>
+            <version>1.0</version>
         </dependency>
-
-
+        
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-atinject_1.0_spec</artifactId>
@@ -170,6 +177,14 @@
                             <token>import org.apache.webbeans.component.spi.InjectionTargetFactory</token>
                             <value>import javax.enterprise.inject.spi.InjectionTargetFactory</value>
                         </replacement>         
+                        <replacement>
+                            <token>import org.apache.webbeans.exception.inject.DefinitionException</token>
+                            <value>import javax.enterprise.inject.spi.DefinitionException</value>
+                        </replacement>         
+                        <replacement>
+                            <token>import org.apache.webbeans.exception.inject.DeploymentException</token>
+                            <value>import javax.enterprise.inject.spi.DeploymentException</value>
+                        </replacement>         
                     </replacements>
                 </configuration>
             </plugin>
@@ -240,17 +255,54 @@
                     <artifactId>cdi-tck-api</artifactId>
                     <version>${cdi11-tck.version}</version>
                     <scope>test</scope>
+                    <exclusions>
+<!--                         <exclusion> -->
+<!--                             <groupId>javax.enterprise</groupId> -->
+<!--                             <artifactId>cdi-api</artifactId> -->
+<!--                         </exclusion> -->
+<!--                         <exclusion> -->
+<!--                             <groupId>javax.el</groupId> -->
+<!--                             <artifactId>el-api</artifactId> -->
+<!--                         </exclusion> -->
+                    </exclusions>
                 </dependency>
                 <dependency>
                     <groupId>org.jboss.cdi.tck</groupId>
                     <artifactId>cdi-tck-impl</artifactId>
                     <version>${cdi11-tck.version}</version>
                     <scope>test</scope>
+                    <exclusions>
+<!--                         <exclusion> -->
+<!--                             <groupId>javax.enterprise</groupId> -->
+<!--                             <artifactId>cdi-api</artifactId> -->
+<!--                         </exclusion> -->
+                        <exclusion>
+                            <groupId>javax.faces</groupId>
+                            <artifactId>jsf-api</artifactId>
+                        </exclusion>
+<!--                         <exclusion> -->
+<!--                             <groupId>javax.servlet</groupId> -->
+<!--                             <artifactId>javax.servlet-api</artifactId>
-->
+<!--                         </exclusion> -->
+<!--                         <exclusion> -->
+<!--                             <groupId>javax.servlet.jsp</groupId> -->
+<!--                             <artifactId>jsp-api</artifactId> -->
+<!--                         </exclusion> -->
+<!--                         <exclusion> -->
+<!--                             <groupId>javax.transaction</groupId> -->
+<!--                             <artifactId>jta</artifactId> -->
+<!--                         </exclusion> -->
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.myfaces.core</groupId>
+                    <artifactId>myfaces-api</artifactId>
+                    <version>2.1.11</version>
                 </dependency>
 
                 <dependency>
                     <groupId>org.apache.openwebbeans.arquillian</groupId>
-                    <artifactId>owb-arquillian-parent</artifactId>
+                    <artifactId>owb-arquillian-standalone</artifactId>
                     <version>${project.version}</version>
                 </dependency>
 
@@ -271,10 +323,6 @@
                     <groupId>org.apache.openwebbeans</groupId>
                     <artifactId>openwebbeans-spi</artifactId>
                 </dependency>
-                <dependency>
-                    <groupId>org.apache.openwebbeans</groupId>
-                    <artifactId>openwebbeans-impl</artifactId>
-                </dependency>
 
             </dependencies>
 
@@ -290,6 +338,32 @@
                             </suiteXmlFiles>
                         </configuration>
                     </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-dependency-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>copy-tck</id>
+                                <phase>generate-test-sources</phase>
+                                <goals>
+                                    <goal>copy</goal>
+                                </goals>
+                                <configuration>
+                                    <artifactItems>
+
+                                        <!-- OWB Porting Package -->
+                                        <artifactItem>
+                                            <groupId>org.apache.openwebbeans</groupId>
+                                            <artifactId>openwebbeans-porting</artifactId>
+                                            <overWrite>true</overWrite>
+                                            <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
+                                        </artifactItem>
+
+                                    </artifactItems>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
                 </plugins>
             </build>
         </profile>

Added: openwebbeans/trunk/webbeans-cdi11/src/main/resources/META-INF/cdi-tck.properties
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-cdi11/src/main/resources/META-INF/cdi-tck.properties?rev=1492581&view=auto
==============================================================================
--- openwebbeans/trunk/webbeans-cdi11/src/main/resources/META-INF/cdi-tck.properties (added)
+++ openwebbeans/trunk/webbeans-cdi11/src/main/resources/META-INF/cdi-tck.properties Thu Jun
13 09:04:40 2013
@@ -0,0 +1,21 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+org.jboss.cdi.tck.libraryDirectory=target/dependency/lib
+org.jboss.cdi.tck.testDataSource=java\:default
+org.jboss.cdi.tck.testJmsConnectionFactory=java\:default
+org.jboss.cdi.tck.testJmsQueue=java\:default
+org.jboss.cdi.tck.testJmsTopic=java\:default

Modified: openwebbeans/trunk/webbeans-cdi11/standalone-suite.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-cdi11/standalone-suite.xml?rev=1492581&r1=1492580&r2=1492581&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-cdi11/standalone-suite.xml (original)
+++ openwebbeans/trunk/webbeans-cdi11/standalone-suite.xml Thu Jun 13 09:04:40 2013
@@ -36,7 +36,9 @@
                 <exclude name="ri-broken" />
                 <exclude name="jboss-as-broken" />
                 <exclude name="broken" />
-                <exclude name="integration"i/>
+                <exclude name="integration" />
+                <exclude name="integration" />
+                <exclude name="javaee-full" />
             </run>
         </groups>
 

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/exception/WebBeansConfigurationException.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/exception/WebBeansConfigurationException.java?rev=1492581&r1=1492580&r2=1492581&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/exception/WebBeansConfigurationException.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/exception/WebBeansConfigurationException.java
Thu Jun 13 09:04:40 2013
@@ -32,11 +32,6 @@ public class WebBeansConfigurationExcept
 
     private static final long serialVersionUID = 1863095663133791175L;
 
-    public WebBeansConfigurationException()
-    {
-        super();
-    }
-
     public WebBeansConfigurationException(String message)
     {
         super(message);

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/exception/definition/DuplicateDefinitionException.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/exception/definition/DuplicateDefinitionException.java?rev=1492581&r1=1492580&r2=1492581&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/exception/definition/DuplicateDefinitionException.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/exception/definition/DuplicateDefinitionException.java
Thu Jun 13 09:04:40 2013
@@ -24,11 +24,6 @@ public class DuplicateDefinitionExceptio
 {
     private static final long serialVersionUID = 2312285271502063304L;
 
-    public DuplicateDefinitionException()
-    {
-        super();
-    }
-
     public DuplicateDefinitionException(String message)
     {
         super(message);

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/impl/InjectionPointImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/impl/InjectionPointImpl.java?rev=1492581&r1=1492580&r2=1492581&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/impl/InjectionPointImpl.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/impl/InjectionPointImpl.java
Thu Jun 13 09:04:40 2013
@@ -303,18 +303,18 @@ class InjectionPointImpl implements Inje
         if(injectionMember instanceof Constructor)
         {
             Constructor<?> constructor = (Constructor<?>) injectionMember;
-            buffer.append("Constructor Injection Point, constructor name :  " + constructor.getName()
+ ", Bean Owner : ["+ ownerBean.toString() + "]");
+            buffer.append("Constructor Injection Point, constructor name :  ").append(constructor.getName()).append(",
Bean Owner : [").append(ownerBean).append("]");
         }
         else if(injectionMember instanceof Method)
         {
             Method method = (Method) injectionMember;
-            buffer.append("Method Injection Point, method name :  " + method.getName() +
", Bean Owner : ["+ ownerBean.toString() + "]");
+            buffer.append("Method Injection Point, method name :  ").append(method.getName()).append(",
Bean Owner : [").append(ownerBean).append("]");
             
         }
         else if(injectionMember instanceof Field)
         {
             Field field = (Field) injectionMember;
-            buffer.append("Field Injection Point, field name :  " + field.getName() + ",
Bean Owner : ["+ ownerBean.toString() + "]");            
+            buffer.append("Field Injection Point, field name :  ").append(field.getName()).append(",
Bean Owner : [").append(ownerBean).append("]");            
         }
         
         return buffer.toString();



Mime
View raw message