You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by xi...@apache.org on 2013/02/03 08:21:58 UTC

svn commit: r1441868 - in /geronimo/server/branches/3.0: ./ plugingroups/javaee6-jetty/src/main/history/ plugingroups/javaee6-tomcat/src/main/history/ plugins/axis/geronimo-axis/ plugins/myfaces/ plugins/myfaces/geronimo-myfaces/ plugins/myfaces/geroni...

Author: xiaming
Date: Sun Feb  3 07:21:58 2013
New Revision: 1441868

URL: http://svn.apache.org/viewvc?rev=1441868&view=rev
Log:
GERONIMO-6267 Update JSF implementation to myfaces 2.1.10

Modified:
    geronimo/server/branches/3.0/plugingroups/javaee6-jetty/src/main/history/dependencies.xml
    geronimo/server/branches/3.0/plugingroups/javaee6-tomcat/src/main/history/dependencies.xml
    geronimo/server/branches/3.0/plugins/axis/geronimo-axis/pom.xml
    geronimo/server/branches/3.0/plugins/myfaces/geronimo-myfaces/pom.xml
    geronimo/server/branches/3.0/plugins/myfaces/geronimo-myfaces/src/main/java/org/apache/geronimo/myfaces/GeronimoFactoryFinderProvider.java
    geronimo/server/branches/3.0/plugins/myfaces/myfaces/pom.xml
    geronimo/server/branches/3.0/plugins/myfaces/myfaces/src/main/history/dependencies.xml
    geronimo/server/branches/3.0/plugins/myfaces/pom.xml
    geronimo/server/branches/3.0/plugins/openejb/openejb-client/pom.xml
    geronimo/server/branches/3.0/plugins/openejb/openejb-client/src/main/history/dependencies.xml
    geronimo/server/branches/3.0/plugins/openejb/openejb/pom.xml
    geronimo/server/branches/3.0/plugins/openejb/openejb/src/main/history/dependencies.xml
    geronimo/server/branches/3.0/plugins/openjpa2/openjpa2/src/main/history/dependencies.xml
    geronimo/server/branches/3.0/plugins/openwebbeans/openwebbeans-deployer/pom.xml
    geronimo/server/branches/3.0/plugins/tomcat/tomcat7/src/main/history/dependencies.xml
    geronimo/server/branches/3.0/plugins/uddi/uddi-jetty/src/main/history/dependencies.xml
    geronimo/server/branches/3.0/plugins/uddi/uddi-tomcat/src/main/history/dependencies.xml
    geronimo/server/branches/3.0/pom.xml
    geronimo/server/branches/3.0/testsuite/aries-testsuite/jsf/jsf-taglib/pom.xml
    geronimo/server/branches/3.0/testsuite/aries-testsuite/jsf/jsf-wab/pom.xml
    geronimo/server/branches/3.0/testsuite/javaee6-testsuite/di1.0-test/pom.xml
    geronimo/server/branches/3.0/testsuite/javaee6-testsuite/el2.2-test/pom.xml
    geronimo/server/branches/3.0/testsuite/javaee6-testsuite/jsf2.0-test/pom.xml
    geronimo/server/branches/3.0/testsuite/javaee6-testsuite/jsp2.2-test/pom.xml
    geronimo/server/branches/3.0/testsuite/javaee6-testsuite/webbean1.0-test/conversation-test/pom.xml
    geronimo/server/branches/3.0/testsuite/javaee6-testsuite/webbean1.0-test/webbean-ejb-test/pom.xml
    geronimo/server/branches/3.0/testsuite/javaee6-testsuite/webbean1.0-test/webbean-jpa-test/pom.xml
    geronimo/server/branches/3.0/testsuite/web-testsuite/test-myfaces/pom.xml

Modified: geronimo/server/branches/3.0/plugingroups/javaee6-jetty/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0/plugingroups/javaee6-jetty/src/main/history/dependencies.xml?rev=1441868&r1=1441867&r2=1441868&view=diff
==============================================================================
--- geronimo/server/branches/3.0/plugingroups/javaee6-jetty/src/main/history/dependencies.xml (original)
+++ geronimo/server/branches/3.0/plugingroups/javaee6-jetty/src/main/history/dependencies.xml Sun Feb  3 07:21:58 2013
@@ -28,7 +28,7 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.plugingroups</groupId>
-        <artifactId>client</artifactId>
+        <artifactId>clientgroup</artifactId>
         <type>car</type>
     </dependency>
     <dependency>

Modified: geronimo/server/branches/3.0/plugingroups/javaee6-tomcat/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0/plugingroups/javaee6-tomcat/src/main/history/dependencies.xml?rev=1441868&r1=1441867&r2=1441868&view=diff
==============================================================================
--- geronimo/server/branches/3.0/plugingroups/javaee6-tomcat/src/main/history/dependencies.xml (original)
+++ geronimo/server/branches/3.0/plugingroups/javaee6-tomcat/src/main/history/dependencies.xml Sun Feb  3 07:21:58 2013
@@ -33,7 +33,7 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.plugingroups</groupId>
-        <artifactId>client</artifactId>
+        <artifactId>clientgroup</artifactId>
         <type>car</type>
     </dependency>
     <dependency>

Modified: geronimo/server/branches/3.0/plugins/axis/geronimo-axis/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0/plugins/axis/geronimo-axis/pom.xml?rev=1441868&r1=1441867&r2=1441868&view=diff
==============================================================================
--- geronimo/server/branches/3.0/plugins/axis/geronimo-axis/pom.xml (original)
+++ geronimo/server/branches/3.0/plugins/axis/geronimo-axis/pom.xml Sun Feb  3 07:21:58 2013
@@ -65,6 +65,12 @@
             <version>${project.version}</version>
             <type>car</type>
         </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-openejb</artifactId>
+            <version>${project.version}</version>
+        </dependency>
 
         <!-- not sure about the scope -->
         <dependency>

Modified: geronimo/server/branches/3.0/plugins/myfaces/geronimo-myfaces/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0/plugins/myfaces/geronimo-myfaces/pom.xml?rev=1441868&r1=1441867&r2=1441868&view=diff
==============================================================================
--- geronimo/server/branches/3.0/plugins/myfaces/geronimo-myfaces/pom.xml (original)
+++ geronimo/server/branches/3.0/plugins/myfaces/geronimo-myfaces/pom.xml Sun Feb  3 07:21:58 2013
@@ -59,7 +59,7 @@
         </dependency>
         
         <dependency>
-            <groupId>org.apache.geronimo.bundles</groupId>
+            <groupId>org.apache.myfaces.core</groupId>
             <artifactId>myfaces-bundle</artifactId>
         </dependency>
 

Modified: geronimo/server/branches/3.0/plugins/myfaces/geronimo-myfaces/src/main/java/org/apache/geronimo/myfaces/GeronimoFactoryFinderProvider.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0/plugins/myfaces/geronimo-myfaces/src/main/java/org/apache/geronimo/myfaces/GeronimoFactoryFinderProvider.java?rev=1441868&r1=1441867&r2=1441868&view=diff
==============================================================================
--- geronimo/server/branches/3.0/plugins/myfaces/geronimo-myfaces/src/main/java/org/apache/geronimo/myfaces/GeronimoFactoryFinderProvider.java (original)
+++ geronimo/server/branches/3.0/plugins/myfaces/geronimo-myfaces/src/main/java/org/apache/geronimo/myfaces/GeronimoFactoryFinderProvider.java Sun Feb  3 07:21:58 2013
@@ -40,6 +40,7 @@ import javax.faces.lifecycle.LifecycleFa
 import javax.faces.render.RenderKitFactory;
 import javax.faces.view.ViewDeclarationLanguageFactory;
 import javax.faces.view.facelets.TagHandlerDelegateFactory;
+import javax.faces.view.facelets.FaceletCacheFactory;
 
 import org.apache.geronimo.web.WebApplicationName;
 import org.apache.myfaces.spi.FactoryFinderProvider;
@@ -76,6 +77,8 @@ public class GeronimoFactoryFinderProvid
     public static final String VIEW_DECLARATION_LANGUAGE_FACTORY = "javax.faces.view.ViewDeclarationLanguageFactory";
 
     public static final String VISIT_CONTEXT_FACTORY = "javax.faces.component.visit.VisitContextFactory";
+    
+    public static final String FACELET_CACHE_FACTORY = "javax.faces.view.facelets.FaceletCacheFactory";
 
     /**
      * used as a monitor for itself and _factories. Maps in this map are used as monitors for themselves and the
@@ -102,6 +105,7 @@ public class GeronimoFactoryFinderProvid
         VALID_FACTORY_NAMES.add(TAG_HANDLER_DELEGATE_FACTORY);
         VALID_FACTORY_NAMES.add(VIEW_DECLARATION_LANGUAGE_FACTORY);
         VALID_FACTORY_NAMES.add(VISIT_CONTEXT_FACTORY);
+        VALID_FACTORY_NAMES.add(FACELET_CACHE_FACTORY);
 
         ABSTRACT_FACTORY_CLASSES.put(APPLICATION_FACTORY, ApplicationFactory.class);
         ABSTRACT_FACTORY_CLASSES.put(EXCEPTION_HANDLER_FACTORY, ExceptionHandlerFactory.class);
@@ -113,6 +117,7 @@ public class GeronimoFactoryFinderProvid
         ABSTRACT_FACTORY_CLASSES.put(TAG_HANDLER_DELEGATE_FACTORY, TagHandlerDelegateFactory.class);
         ABSTRACT_FACTORY_CLASSES.put(VIEW_DECLARATION_LANGUAGE_FACTORY, ViewDeclarationLanguageFactory.class);
         ABSTRACT_FACTORY_CLASSES.put(VISIT_CONTEXT_FACTORY, VisitContextFactory.class);
+        ABSTRACT_FACTORY_CLASSES.put(FACELET_CACHE_FACTORY, FaceletCacheFactory.class);
         try {
             ClassLoader classLoader;
             if (System.getSecurityManager() != null) {

Modified: geronimo/server/branches/3.0/plugins/myfaces/myfaces/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0/plugins/myfaces/myfaces/pom.xml?rev=1441868&r1=1441867&r2=1441868&view=diff
==============================================================================
--- geronimo/server/branches/3.0/plugins/myfaces/myfaces/pom.xml (original)
+++ geronimo/server/branches/3.0/plugins/myfaces/myfaces/pom.xml Sun Feb  3 07:21:58 2013
@@ -70,7 +70,7 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.bundles</groupId>
+            <groupId>org.apache.myfaces.core</groupId>
             <artifactId>myfaces-bundle</artifactId>
         </dependency>
 

Modified: geronimo/server/branches/3.0/plugins/myfaces/myfaces/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0/plugins/myfaces/myfaces/src/main/history/dependencies.xml?rev=1441868&r1=1441867&r2=1441868&view=diff
==============================================================================
--- geronimo/server/branches/3.0/plugins/myfaces/myfaces/src/main/history/dependencies.xml (original)
+++ geronimo/server/branches/3.0/plugins/myfaces/myfaces/src/main/history/dependencies.xml Sun Feb  3 07:21:58 2013
@@ -17,11 +17,6 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.bundles</groupId>
-        <artifactId>myfaces-bundle</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>j2ee-server</artifactId>
         <type>car</type>
@@ -57,6 +52,11 @@
         <type>jar</type>
     </dependency>
     <dependency>
+        <groupId>org.apache.myfaces.core</groupId>
+        <artifactId>myfaces-bundle</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>org.apache.openejb</groupId>
         <artifactId>openejb-jee</artifactId>
         <type>jar</type>

Modified: geronimo/server/branches/3.0/plugins/myfaces/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0/plugins/myfaces/pom.xml?rev=1441868&r1=1441867&r2=1441868&view=diff
==============================================================================
--- geronimo/server/branches/3.0/plugins/myfaces/pom.xml (original)
+++ geronimo/server/branches/3.0/plugins/myfaces/pom.xml Sun Feb  3 07:21:58 2013
@@ -43,7 +43,7 @@
     <dependencyManagement>
         <dependencies>
             <dependency>
-                <groupId>org.apache.geronimo.bundles</groupId>
+                <groupId>org.apache.myfaces.core</groupId>
                 <artifactId>myfaces-bundle</artifactId>
                 <version>${myfacesVersion}</version>
                 <exclusions>

Modified: geronimo/server/branches/3.0/plugins/openejb/openejb-client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0/plugins/openejb/openejb-client/pom.xml?rev=1441868&r1=1441867&r2=1441868&view=diff
==============================================================================
--- geronimo/server/branches/3.0/plugins/openejb/openejb-client/pom.xml (original)
+++ geronimo/server/branches/3.0/plugins/openejb/openejb-client/pom.xml Sun Feb  3 07:21:58 2013
@@ -72,7 +72,7 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.bundles</groupId>
+            <groupId>org.apache.myfaces.core</groupId>
             <artifactId>myfaces-bundle</artifactId>
         </dependency>
         <dependency>

Modified: geronimo/server/branches/3.0/plugins/openejb/openejb-client/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0/plugins/openejb/openejb-client/src/main/history/dependencies.xml?rev=1441868&r1=1441867&r2=1441868&view=diff
==============================================================================
--- geronimo/server/branches/3.0/plugins/openejb/openejb-client/src/main/history/dependencies.xml (original)
+++ geronimo/server/branches/3.0/plugins/openejb/openejb-client/src/main/history/dependencies.xml Sun Feb  3 07:21:58 2013
@@ -23,11 +23,6 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.bundles</groupId>
-        <artifactId>myfaces-bundle</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.bundles</groupId>
         <artifactId>scannotation</artifactId>
         <type>jar</type>
     </dependency>
@@ -87,6 +82,11 @@
         <type>jar</type>
     </dependency>
     <dependency>
+        <groupId>org.apache.myfaces.core</groupId>
+        <artifactId>myfaces-bundle</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>org.apache.openejb</groupId>
         <artifactId>commons-dbcp-all</artifactId>
         <type>jar</type>

Modified: geronimo/server/branches/3.0/plugins/openejb/openejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0/plugins/openejb/openejb/pom.xml?rev=1441868&r1=1441867&r2=1441868&view=diff
==============================================================================
--- geronimo/server/branches/3.0/plugins/openejb/openejb/pom.xml (original)
+++ geronimo/server/branches/3.0/plugins/openejb/openejb/pom.xml Sun Feb  3 07:21:58 2013
@@ -79,7 +79,7 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.bundles</groupId>
+            <groupId>org.apache.myfaces.core</groupId>
             <artifactId>myfaces-bundle</artifactId>
         </dependency>
         <dependency>

Modified: geronimo/server/branches/3.0/plugins/openejb/openejb/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0/plugins/openejb/openejb/src/main/history/dependencies.xml?rev=1441868&r1=1441867&r2=1441868&view=diff
==============================================================================
--- geronimo/server/branches/3.0/plugins/openejb/openejb/src/main/history/dependencies.xml (original)
+++ geronimo/server/branches/3.0/plugins/openejb/openejb/src/main/history/dependencies.xml Sun Feb  3 07:21:58 2013
@@ -23,11 +23,6 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.bundles</groupId>
-        <artifactId>myfaces-bundle</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.bundles</groupId>
         <artifactId>scannotation</artifactId>
         <type>jar</type>
     </dependency>
@@ -92,6 +87,11 @@
         <type>jar</type>
     </dependency>
     <dependency>
+        <groupId>org.apache.myfaces.core</groupId>
+        <artifactId>myfaces-bundle</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>org.apache.openejb</groupId>
         <artifactId>mbean-annotation-api</artifactId>
         <type>jar</type>

Modified: geronimo/server/branches/3.0/plugins/openjpa2/openjpa2/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0/plugins/openjpa2/openjpa2/src/main/history/dependencies.xml?rev=1441868&r1=1441867&r2=1441868&view=diff
==============================================================================
--- geronimo/server/branches/3.0/plugins/openjpa2/openjpa2/src/main/history/dependencies.xml (original)
+++ geronimo/server/branches/3.0/plugins/openjpa2/openjpa2/src/main/history/dependencies.xml Sun Feb  3 07:21:58 2013
@@ -7,6 +7,11 @@
         <type>car</type>
     </module-id>
     <dependency>
+        <groupId>asm</groupId>
+        <artifactId>asm</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>commons-dbcp</groupId>
         <artifactId>commons-dbcp</artifactId>
         <type>jar</type>
@@ -17,6 +22,11 @@
         <type>jar</type>
     </dependency>
     <dependency>
+        <groupId>javax.xml.stream</groupId>
+        <artifactId>stax-api</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>org.apache.aries.jpa</groupId>
         <artifactId>org.apache.aries.jpa.api</artifactId>
         <type>jar</type>

Modified: geronimo/server/branches/3.0/plugins/openwebbeans/openwebbeans-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0/plugins/openwebbeans/openwebbeans-deployer/pom.xml?rev=1441868&r1=1441867&r2=1441868&view=diff
==============================================================================
--- geronimo/server/branches/3.0/plugins/openwebbeans/openwebbeans-deployer/pom.xml (original)
+++ geronimo/server/branches/3.0/plugins/openwebbeans/openwebbeans-deployer/pom.xml Sun Feb  3 07:21:58 2013
@@ -65,7 +65,7 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.bundles</groupId>
+            <groupId>org.apache.myfaces.core</groupId>
             <artifactId>myfaces-bundle</artifactId>
         </dependency>
 

Modified: geronimo/server/branches/3.0/plugins/tomcat/tomcat7/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0/plugins/tomcat/tomcat7/src/main/history/dependencies.xml?rev=1441868&r1=1441867&r2=1441868&view=diff
==============================================================================
--- geronimo/server/branches/3.0/plugins/tomcat/tomcat7/src/main/history/dependencies.xml (original)
+++ geronimo/server/branches/3.0/plugins/tomcat/tomcat7/src/main/history/dependencies.xml Sun Feb  3 07:21:58 2013
@@ -37,6 +37,11 @@
         <type>jar</type>
     </dependency>
     <dependency>
+        <groupId>org.apache.geronimo.ext.tomcat</groupId>
+        <artifactId>util</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>geronimo-deployment</artifactId>
         <type>jar</type>

Modified: geronimo/server/branches/3.0/plugins/uddi/uddi-jetty/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0/plugins/uddi/uddi-jetty/src/main/history/dependencies.xml?rev=1441868&r1=1441867&r2=1441868&view=diff
==============================================================================
--- geronimo/server/branches/3.0/plugins/uddi/uddi-jetty/src/main/history/dependencies.xml (original)
+++ geronimo/server/branches/3.0/plugins/uddi/uddi-jetty/src/main/history/dependencies.xml Sun Feb  3 07:21:58 2013
@@ -7,6 +7,16 @@
         <type>car</type>
     </module-id>
     <dependency>
+        <groupId>asm</groupId>
+        <artifactId>asm</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>javax.xml.stream</groupId>
+        <artifactId>stax-api</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>org.apache.geronimo.bundles</groupId>
         <artifactId>commons-digester</artifactId>
         <type>jar</type>

Modified: geronimo/server/branches/3.0/plugins/uddi/uddi-tomcat/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0/plugins/uddi/uddi-tomcat/src/main/history/dependencies.xml?rev=1441868&r1=1441867&r2=1441868&view=diff
==============================================================================
--- geronimo/server/branches/3.0/plugins/uddi/uddi-tomcat/src/main/history/dependencies.xml (original)
+++ geronimo/server/branches/3.0/plugins/uddi/uddi-tomcat/src/main/history/dependencies.xml Sun Feb  3 07:21:58 2013
@@ -7,6 +7,11 @@
         <type>car</type>
     </module-id>
     <dependency>
+        <groupId>asm</groupId>
+        <artifactId>asm</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>commons-dbcp</groupId>
         <artifactId>commons-dbcp</artifactId>
         <type>jar</type>
@@ -17,6 +22,11 @@
         <type>jar</type>
     </dependency>
     <dependency>
+        <groupId>javax.xml.stream</groupId>
+        <artifactId>stax-api</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>org.apache.geronimo.bundles</groupId>
         <artifactId>commons-digester</artifactId>
         <type>jar</type>

Modified: geronimo/server/branches/3.0/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0/pom.xml?rev=1441868&r1=1441867&r2=1441868&view=diff
==============================================================================
--- geronimo/server/branches/3.0/pom.xml (original)
+++ geronimo/server/branches/3.0/pom.xml Sun Feb  3 07:21:58 2013
@@ -95,7 +95,7 @@
         <geronimoel.version>1.0.4-SNAPSHOT</geronimoel.version>
         <geronimoosgiregistry.version>1.1</geronimoosgiregistry.version>
         <geronimojaxws.version>1.1</geronimojaxws.version>
-        <myfacesVersion>2.0.9_1</myfacesVersion>
+        <myfacesVersion>2.1.10</myfacesVersion>
 
         <!-- Deployers -->
         <gbeanDeployerBootstrap>org.apache.geronimo.framework/geronimo-gbean-deployer-bootstrap/${project.version}/car
@@ -2412,7 +2412,7 @@ only found in cxf
                         <enabled>true</enabled>
                     </releases>
                 </repository>
-                <repository>
+                <!--<repository>
                     <id>openqa-snapshots</id>
                     <name>Openqa Snapshot Repository</name>
                     <url>http://nexus.openqa.org/content/repositories/snapshots</url>
@@ -2425,7 +2425,7 @@ only found in cxf
                     <releases>
                         <enabled>false</enabled>
                     </releases>
-                </repository>                
+                </repository>-->                
             </repositories>
         </profile>
 

Modified: geronimo/server/branches/3.0/testsuite/aries-testsuite/jsf/jsf-taglib/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0/testsuite/aries-testsuite/jsf/jsf-taglib/pom.xml?rev=1441868&r1=1441867&r2=1441868&view=diff
==============================================================================
--- geronimo/server/branches/3.0/testsuite/aries-testsuite/jsf/jsf-taglib/pom.xml (original)
+++ geronimo/server/branches/3.0/testsuite/aries-testsuite/jsf/jsf-taglib/pom.xml Sun Feb  3 07:21:58 2013
@@ -36,7 +36,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.geronimo.bundles</groupId>
+            <groupId>org.apache.myfaces.core</groupId>
             <artifactId>myfaces-bundle</artifactId>
             <scope>provided</scope>
         </dependency>

Modified: geronimo/server/branches/3.0/testsuite/aries-testsuite/jsf/jsf-wab/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0/testsuite/aries-testsuite/jsf/jsf-wab/pom.xml?rev=1441868&r1=1441867&r2=1441868&view=diff
==============================================================================
--- geronimo/server/branches/3.0/testsuite/aries-testsuite/jsf/jsf-wab/pom.xml (original)
+++ geronimo/server/branches/3.0/testsuite/aries-testsuite/jsf/jsf-wab/pom.xml Sun Feb  3 07:21:58 2013
@@ -36,7 +36,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.geronimo.bundles</groupId>
+            <groupId>org.apache.myfaces.core</groupId>
             <artifactId>myfaces-bundle</artifactId>
             <scope>provided</scope>
         </dependency>

Modified: geronimo/server/branches/3.0/testsuite/javaee6-testsuite/di1.0-test/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0/testsuite/javaee6-testsuite/di1.0-test/pom.xml?rev=1441868&r1=1441867&r2=1441868&view=diff
==============================================================================
--- geronimo/server/branches/3.0/testsuite/javaee6-testsuite/di1.0-test/pom.xml (original)
+++ geronimo/server/branches/3.0/testsuite/javaee6-testsuite/di1.0-test/pom.xml Sun Feb  3 07:21:58 2013
@@ -46,7 +46,7 @@
     <dependencies>
         <!-- MyFaces API -->
         <dependency>
-            <groupId>org.apache.geronimo.bundles</groupId>
+            <groupId>org.apache.myfaces.core</groupId>
             <artifactId>myfaces-bundle</artifactId>
             <scope>provided</scope>
         </dependency>

Modified: geronimo/server/branches/3.0/testsuite/javaee6-testsuite/el2.2-test/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0/testsuite/javaee6-testsuite/el2.2-test/pom.xml?rev=1441868&r1=1441867&r2=1441868&view=diff
==============================================================================
--- geronimo/server/branches/3.0/testsuite/javaee6-testsuite/el2.2-test/pom.xml (original)
+++ geronimo/server/branches/3.0/testsuite/javaee6-testsuite/el2.2-test/pom.xml Sun Feb  3 07:21:58 2013
@@ -55,7 +55,7 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.geronimo.bundles</groupId>
+            <groupId>org.apache.myfaces.core</groupId>
             <artifactId>myfaces-bundle</artifactId>
             <scope>provided</scope>
         </dependency>

Modified: geronimo/server/branches/3.0/testsuite/javaee6-testsuite/jsf2.0-test/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0/testsuite/javaee6-testsuite/jsf2.0-test/pom.xml?rev=1441868&r1=1441867&r2=1441868&view=diff
==============================================================================
--- geronimo/server/branches/3.0/testsuite/javaee6-testsuite/jsf2.0-test/pom.xml (original)
+++ geronimo/server/branches/3.0/testsuite/javaee6-testsuite/jsf2.0-test/pom.xml Sun Feb  3 07:21:58 2013
@@ -54,7 +54,7 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.geronimo.bundles</groupId>
+            <groupId>org.apache.myfaces.core</groupId>
             <artifactId>myfaces-bundle</artifactId>
             <scope>provided</scope>
         </dependency>

Modified: geronimo/server/branches/3.0/testsuite/javaee6-testsuite/jsp2.2-test/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0/testsuite/javaee6-testsuite/jsp2.2-test/pom.xml?rev=1441868&r1=1441867&r2=1441868&view=diff
==============================================================================
--- geronimo/server/branches/3.0/testsuite/javaee6-testsuite/jsp2.2-test/pom.xml (original)
+++ geronimo/server/branches/3.0/testsuite/javaee6-testsuite/jsp2.2-test/pom.xml Sun Feb  3 07:21:58 2013
@@ -52,7 +52,7 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.geronimo.bundles</groupId>
+            <groupId>org.apache.myfaces.core</groupId>
             <artifactId>myfaces-bundle</artifactId>
             <scope>provided</scope>
         </dependency>

Modified: geronimo/server/branches/3.0/testsuite/javaee6-testsuite/webbean1.0-test/conversation-test/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0/testsuite/javaee6-testsuite/webbean1.0-test/conversation-test/pom.xml?rev=1441868&r1=1441867&r2=1441868&view=diff
==============================================================================
--- geronimo/server/branches/3.0/testsuite/javaee6-testsuite/webbean1.0-test/conversation-test/pom.xml (original)
+++ geronimo/server/branches/3.0/testsuite/javaee6-testsuite/webbean1.0-test/conversation-test/pom.xml Sun Feb  3 07:21:58 2013
@@ -47,7 +47,7 @@
     <dependencies>
         <!-- JSR-314 API - JSF 2.0 -->
         <dependency>
-            <groupId>org.apache.geronimo.bundles</groupId>
+            <groupId>org.apache.myfaces.core</groupId>
             <artifactId>myfaces-bundle</artifactId>
             <scope>provided</scope>
         </dependency>

Modified: geronimo/server/branches/3.0/testsuite/javaee6-testsuite/webbean1.0-test/webbean-ejb-test/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0/testsuite/javaee6-testsuite/webbean1.0-test/webbean-ejb-test/pom.xml?rev=1441868&r1=1441867&r2=1441868&view=diff
==============================================================================
--- geronimo/server/branches/3.0/testsuite/javaee6-testsuite/webbean1.0-test/webbean-ejb-test/pom.xml (original)
+++ geronimo/server/branches/3.0/testsuite/javaee6-testsuite/webbean1.0-test/webbean-ejb-test/pom.xml Sun Feb  3 07:21:58 2013
@@ -47,7 +47,7 @@
     <dependencies>
         <!-- JSR-314 API - JSF 2.0 -->
         <dependency>
-            <groupId>org.apache.geronimo.bundles</groupId>
+            <groupId>org.apache.myfaces.core</groupId>
             <artifactId>myfaces-bundle</artifactId>
             <scope>provided</scope>
         </dependency>

Modified: geronimo/server/branches/3.0/testsuite/javaee6-testsuite/webbean1.0-test/webbean-jpa-test/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0/testsuite/javaee6-testsuite/webbean1.0-test/webbean-jpa-test/pom.xml?rev=1441868&r1=1441867&r2=1441868&view=diff
==============================================================================
--- geronimo/server/branches/3.0/testsuite/javaee6-testsuite/webbean1.0-test/webbean-jpa-test/pom.xml (original)
+++ geronimo/server/branches/3.0/testsuite/javaee6-testsuite/webbean1.0-test/webbean-jpa-test/pom.xml Sun Feb  3 07:21:58 2013
@@ -53,7 +53,7 @@
         </dependency>
         <!-- JSF -->
         <dependency>
-            <groupId>org.apache.geronimo.bundles</groupId>
+            <groupId>org.apache.myfaces.core</groupId>
             <artifactId>myfaces-bundle</artifactId>
             <scope>provided</scope>
         </dependency>

Modified: geronimo/server/branches/3.0/testsuite/web-testsuite/test-myfaces/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0/testsuite/web-testsuite/test-myfaces/pom.xml?rev=1441868&r1=1441867&r2=1441868&view=diff
==============================================================================
--- geronimo/server/branches/3.0/testsuite/web-testsuite/test-myfaces/pom.xml (original)
+++ geronimo/server/branches/3.0/testsuite/web-testsuite/test-myfaces/pom.xml Sun Feb  3 07:21:58 2013
@@ -48,7 +48,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.geronimo.bundles</groupId>
+            <groupId>org.apache.myfaces.core</groupId>
             <artifactId>myfaces-bundle</artifactId>
             <scope>provided</scope>
         </dependency>