geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r937175 - in /geronimo/server/trunk: ./ plugins/myfaces/ plugins/myfaces/myfaces-jetty-server/ plugins/myfaces/myfaces-jetty-server/src/ plugins/myfaces/myfaces-jetty-server/src/main/ plugins/myfaces/myfaces-jetty-server/src/main/resources/...
Date Fri, 23 Apr 2010 07:41:23 GMT
Author: djencks
Date: Fri Apr 23 07:41:23 2010
New Revision: 937175

URL: http://svn.apache.org/viewvc?rev=937175&view=rev
Log:
Move myfaces to latest released version 2.0.0.  Move dependency management to myfaces plugin

Added:
    geronimo/server/trunk/plugins/myfaces/myfaces-jetty-server/
      - copied from r907905, geronimo/server/trunk/plugins/myfaces/myfaces-jetty-server/
    geronimo/server/trunk/plugins/myfaces/myfaces-jetty-server/pom.xml
      - copied unchanged from r907905, geronimo/server/trunk/plugins/myfaces/myfaces-jetty-server/pom.xml
    geronimo/server/trunk/plugins/myfaces/myfaces-jetty-server/src/
      - copied from r907905, geronimo/server/trunk/plugins/myfaces/myfaces-jetty-server/src/
    geronimo/server/trunk/plugins/myfaces/myfaces-jetty-server/src/main/
      - copied from r907905, geronimo/server/trunk/plugins/myfaces/myfaces-jetty-server/src/main/
    geronimo/server/trunk/plugins/myfaces/myfaces-jetty-server/src/main/resources/
      - copied from r907905, geronimo/server/trunk/plugins/myfaces/myfaces-jetty-server/src/main/resources/
Modified:
    geronimo/server/trunk/plugins/myfaces/pom.xml
    geronimo/server/trunk/pom.xml
    geronimo/server/trunk/testsuite/web-testsuite/test-myfaces/pom.xml

Modified: geronimo/server/trunk/plugins/myfaces/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/myfaces/pom.xml?rev=937175&r1=937174&r2=937175&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/myfaces/pom.xml (original)
+++ geronimo/server/trunk/plugins/myfaces/pom.xml Fri Apr 23 07:41:23 2010
@@ -39,5 +39,68 @@
         <module>myfaces</module>
         <module>myfaces-deployer</module>
     </modules>
+    <profiles>
+        <profile>
+            <id>mini-servers</id>
+            <modules>
+                <module>myfaces-jetty-server</module>
+            </modules>
+        </profile>
+    </profiles>
 
+    <dependencyManagement>
+        <dependencies>
+            <!--JSF 1.2 JARs from Apache MyFaces -->
+            <dependency>
+                <groupId>org.apache.myfaces.core</groupId>
+                <artifactId>myfaces-api</artifactId>
+                <version>2.0.0</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>commons-logging</groupId>
+                        <artifactId>commons-logging</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>javax.validation</groupId>
+                        <artifactId>validation-api</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>javax.el</groupId>
+                        <artifactId>el-api</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.myfaces.core</groupId>
+                <artifactId>myfaces-impl</artifactId>
+                <version>2.0.0</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>commons-logging</groupId>
+                        <artifactId>commons-logging</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>commons-digester</groupId>
+                        <artifactId>commons-digester</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>commons-discovery</groupId>
+                        <artifactId>commons-discovery</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>commons-codec</groupId>
+                        <artifactId>commons-codec</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>commons-beanutils</groupId>
+                        <artifactId>commons-beanutils</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
+            
+        </dependencies>
+    </dependencyManagement>
+                
 </project>

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=937175&r1=937174&r2=937175&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Fri Apr 23 07:41:23 2010
@@ -1390,55 +1390,6 @@
                 </exclusions>
             </dependency>
 
-            <!--JSF 1.2 JARs from Apache MyFaces -->
-            <dependency>
-                <groupId>org.apache.myfaces.core</groupId>
-                <artifactId>myfaces-api</artifactId>
-                <version>2.0.0-SNAPSHOT</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>commons-logging</groupId>
-                        <artifactId>commons-logging</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>javax.validation</groupId>
-                        <artifactId>validation-api</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>javax.el</groupId>
-                        <artifactId>el-api</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.myfaces.core</groupId>
-                <artifactId>myfaces-impl</artifactId>
-                <version>2.0.0-SNAPSHOT</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>commons-logging</groupId>
-                        <artifactId>commons-logging</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>commons-digester</groupId>
-                        <artifactId>commons-digester</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>commons-discovery</groupId>
-                        <artifactId>commons-discovery</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>commons-codec</groupId>
-                        <artifactId>commons-codec</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>commons-beanutils</groupId>
-                        <artifactId>commons-beanutils</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-
             <dependency>
                 <groupId>org.apache.ws.commons.axiom</groupId>
                 <artifactId>axiom-api</artifactId>

Modified: geronimo/server/trunk/testsuite/web-testsuite/test-myfaces/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-myfaces/pom.xml?rev=937175&r1=937174&r2=937175&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-myfaces/pom.xml (original)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-myfaces/pom.xml Fri Apr 23 07:41:23
2010
@@ -34,6 +34,18 @@
     <name>Geronimo TestSuite :: Web Testsuite :: Test MyFaces</name>
     <packaging>war</packaging>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>myfaces</artifactId>
+                <version>${version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <dependencies>
         <dependency>
             <groupId>org.slf4j</groupId>



Mime
View raw message