You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by gp...@apache.org on 2011/03/16 08:25:38 UTC

svn commit: r1082078 - in /myfaces/extensions/cdi/trunk: examples/jsf-examples/hello_myfaces-codi_jsf20/pom.xml pom.xml

Author: gpetracek
Date: Wed Mar 16 07:25:38 2011
New Revision: 1082078

URL: http://svn.apache.org/viewvc?rev=1082078&view=rev
Log:
EXTCDI-152 improvement for weld/glassfish deployments

Modified:
    myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf20/pom.xml
    myfaces/extensions/cdi/trunk/pom.xml

Modified: myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf20/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf20/pom.xml?rev=1082078&r1=1082077&r2=1082078&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf20/pom.xml (original)
+++ myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf20/pom.xml Wed Mar 16 07:25:38 2011
@@ -40,6 +40,17 @@
 
     <dependencies>
         <dependency>
+            <groupId>org.apache.myfaces.extensions.cdi</groupId>
+            <artifactId>myfaces-extcdi-dist-jsf20</artifactId>
+            <scope>compile</scope>
+        </dependency>
+
+        <!-- or use the modules you need individually.
+        ATTENTION: some application servers have bugs concerning the deployment of individual modules.
+        In this example we use the all-in-one jar to avoid problems with the jee6 profile due to the mentioned
+        application server issues.-->
+        <!--
+        <dependency>
             <groupId>org.apache.myfaces.extensions.cdi.core</groupId>
             <artifactId>myfaces-extcdi-core-api</artifactId>
             <scope>compile</scope>
@@ -74,13 +85,7 @@
             <artifactId>myfaces-extcdi-message-module-impl</artifactId>
             <scope>runtime</scope>
         </dependency>
-
-        <!-- alternative to the single modules -->
-        <!--dependency>
-            <groupId>org.apache.myfaces.extensions.cdi</groupId>
-            <artifactId>myfaces-extcdi-dist-jsf20</artifactId>
-            <scope>compile</scope>
-        </dependency-->
+        -->
 
         <!-- test dependencies -->
         <dependency>
@@ -232,6 +237,12 @@
                 </dependency>
 
                 <dependency>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-jpa_1.0_spec</artifactId>
+                    <scope>runtime</scope>
+                </dependency>
+
+                <dependency>
                     <groupId>dom4j</groupId>
                     <artifactId>dom4j</artifactId>
                     <version>1.6.1</version>

Modified: myfaces/extensions/cdi/trunk/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/pom.xml?rev=1082078&r1=1082077&r2=1082078&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/pom.xml (original)
+++ myfaces/extensions/cdi/trunk/pom.xml Wed Mar 16 07:25:38 2011
@@ -155,6 +155,20 @@
                 <scope>provided</scope>
             </dependency>
 
+            <dependency>
+                <groupId>org.apache.myfaces.extensions.cdi</groupId>
+                <artifactId>myfaces-extcdi-dist-jsf12</artifactId>
+                <version>0.9.4-SNAPSHOT</version>
+                <scope>provided</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.myfaces.extensions.cdi</groupId>
+                <artifactId>myfaces-extcdi-dist-jsf20</artifactId>
+                <version>0.9.4-SNAPSHOT</version>
+                <scope>provided</scope>
+            </dependency>
+
             <!-- the JSF independent core -->
             <dependency>
                 <groupId>org.apache.myfaces.extensions.cdi.core</groupId>
@@ -286,6 +300,13 @@
 
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-jpa_1.0_spec</artifactId>
+                <version>1.1.2</version>
+                <scope>provided</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-jta_1.1_spec</artifactId>
                 <version>1.1.1</version>
                 <scope>provided</scope>