geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sppa...@apache.org
Subject svn commit: r486169 - in /geronimo/server/trunk: ./ configs/jetty6/ configs/tomcat6/ modules/geronimo-web-2.5-builder/ modules/geronimo-web-2.5-builder/repository/ modules/geronimo-web-2.5-builder/repository/org/ modules/geronimo-web-2.5-builder/reposi...
Date Tue, 12 Dec 2006 14:53:51 GMT
Author: sppatel
Date: Tue Dec 12 06:53:49 2006
New Revision: 486169

URL: http://svn.apache.org/viewvc?view=rev&rev=486169
Log:
GERONIMO-2648 Integrate JSR 1.2 into 2.0-M1

Added:
    geronimo/server/trunk/modules/geronimo-web-2.5-builder/repository/
    geronimo/server/trunk/modules/geronimo-web-2.5-builder/repository/org/
    geronimo/server/trunk/modules/geronimo-web-2.5-builder/repository/org/apache/
    geronimo/server/trunk/modules/geronimo-web-2.5-builder/repository/org/apache/myfaces/
    geronimo/server/trunk/modules/geronimo-web-2.5-builder/repository/org/apache/myfaces/core/
    geronimo/server/trunk/modules/geronimo-web-2.5-builder/repository/org/apache/myfaces/core/myfaces-api/
    geronimo/server/trunk/modules/geronimo-web-2.5-builder/repository/org/apache/myfaces/core/myfaces-api/1.2.0-SNAPSHOT/
    geronimo/server/trunk/modules/geronimo-web-2.5-builder/repository/org/apache/myfaces/core/myfaces-api/1.2.0-SNAPSHOT/myfaces-api-1.2.0-SNAPSHOT.jar
  (with props)
    geronimo/server/trunk/modules/geronimo-web-2.5-builder/repository/org/apache/myfaces/core/myfaces-api/1.2.0-SNAPSHOT/myfaces-api-1.2.0-SNAPSHOT.jar.md5
    geronimo/server/trunk/modules/geronimo-web-2.5-builder/repository/org/apache/myfaces/core/myfaces-impl/
    geronimo/server/trunk/modules/geronimo-web-2.5-builder/repository/org/apache/myfaces/core/myfaces-impl/1.2.0-SNAPSHOT/
    geronimo/server/trunk/modules/geronimo-web-2.5-builder/repository/org/apache/myfaces/core/myfaces-impl/1.2.0-SNAPSHOT/myfaces-impl-1.2.0-SNAPSHOT.jar
  (with props)
    geronimo/server/trunk/modules/geronimo-web-2.5-builder/repository/org/apache/myfaces/core/myfaces-impl/1.2.0-SNAPSHOT/myfaces-impl-1.2.0-SNAPSHOT.jar.md5
Modified:
    geronimo/server/trunk/configs/jetty6/pom.xml
    geronimo/server/trunk/configs/tomcat6/pom.xml
    geronimo/server/trunk/modules/geronimo-web-2.5-builder/pom.xml
    geronimo/server/trunk/pom.xml

Modified: geronimo/server/trunk/configs/jetty6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jetty6/pom.xml?view=diff&rev=486169&r1=486168&r2=486169
==============================================================================
--- geronimo/server/trunk/configs/jetty6/pom.xml (original)
+++ geronimo/server/trunk/configs/jetty6/pom.xml Tue Dec 12 06:53:49 2006
@@ -6,9 +6,9 @@
   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.
@@ -32,9 +32,9 @@
     <artifactId>jetty6</artifactId>
     <name>Geronimo Configs :: Jetty 6</name>
     <packaging>car</packaging>
-    
+
     <dependencies>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-server</artifactId>
@@ -80,8 +80,18 @@
             <artifactId>jstl</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.myfaces.core</groupId>
+            <artifactId>myfaces-api</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.myfaces.core</groupId>
+            <artifactId>myfaces-impl</artifactId>
+        </dependency>
+
     </dependencies>
-    
+
     <!--
     HACK: jstl:jstl:jar:1.2 is not available on a m2 repo, so include them here
           to avoid needing to setup an m1 repo which causes problems resolving

Modified: geronimo/server/trunk/configs/tomcat6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/tomcat6/pom.xml?view=diff&rev=486169&r1=486168&r2=486169
==============================================================================
--- geronimo/server/trunk/configs/tomcat6/pom.xml (original)
+++ geronimo/server/trunk/configs/tomcat6/pom.xml Tue Dec 12 06:53:49 2006
@@ -6,9 +6,9 @@
   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.
@@ -21,7 +21,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
-    
+
     <parent>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>configs</artifactId>
@@ -32,9 +32,9 @@
     <artifactId>tomcat6</artifactId>
     <name>Geronimo Configs :: Tomcat</name>
     <packaging>car</packaging>
-    
+
     <dependencies>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-server</artifactId>
@@ -61,14 +61,24 @@
             <artifactId>geronimo-tomcat6</artifactId>
             <version>${version}</version>
         </dependency>
-        
+
         <dependency>
             <groupId>jstl</groupId>
             <artifactId>jstl</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.myfaces.core</groupId>
+            <artifactId>myfaces-api</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.myfaces.core</groupId>
+            <artifactId>myfaces-impl</artifactId>
+        </dependency>
+
     </dependencies>
-    
+
     <repositories>
         <repository>
             <id>tomcat6-repo</id>
@@ -101,7 +111,7 @@
                 <filtering>true</filtering>
             </resource>
         </resources>
-        
+
 <!--
         <plugins>
             <plugin>

Modified: geronimo/server/trunk/modules/geronimo-web-2.5-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-web-2.5-builder/pom.xml?view=diff&rev=486169&r1=486168&r2=486169
==============================================================================
--- geronimo/server/trunk/modules/geronimo-web-2.5-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-web-2.5-builder/pom.xml Tue Dec 12 06:53:49 2006
@@ -21,7 +21,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
-    
+
     <parent>
         <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>modules</artifactId>
@@ -31,9 +31,9 @@
 
     <artifactId>geronimo-web-2.5-builder</artifactId>
     <name>Geronimo :: Web 2.5 :: Builder</name>
-    
+
     <dependencies>
-        
+
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>geronimo-web-builder</artifactId>
@@ -65,8 +65,18 @@
             <artifactId>jstl</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.myfaces.core</groupId>
+            <artifactId>myfaces-api</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.myfaces.core</groupId>
+            <artifactId>myfaces-impl</artifactId>
+        </dependency>
+
     </dependencies>
-    
+
     <build>
         <plugins>
         </plugins>
@@ -77,11 +87,25 @@
           to avoid needing to setup an m1 repo which causes problems resolving
           dependencies.
     -->
+    <!--
+    HACK: Include local repo to pick up the MyFaces jars which have not yet been released
+    -->
     <repositories>
         <repository>
             <id>java.net</id>
             <url>https://maven-repository.dev.java.net/nonav/repository</url>
             <layout>legacy</layout>
+        </repository>
+        <repository>
+            <id>module-local</id>
+            <url>file://${pom.basedir}/repository</url>
+            <layout>default</layout>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
         </repository>
     </repositories>
 

Added: geronimo/server/trunk/modules/geronimo-web-2.5-builder/repository/org/apache/myfaces/core/myfaces-api/1.2.0-SNAPSHOT/myfaces-api-1.2.0-SNAPSHOT.jar
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-web-2.5-builder/repository/org/apache/myfaces/core/myfaces-api/1.2.0-SNAPSHOT/myfaces-api-1.2.0-SNAPSHOT.jar?view=auto&rev=486169
==============================================================================
Binary file - no diff available.

Propchange: geronimo/server/trunk/modules/geronimo-web-2.5-builder/repository/org/apache/myfaces/core/myfaces-api/1.2.0-SNAPSHOT/myfaces-api-1.2.0-SNAPSHOT.jar
------------------------------------------------------------------------------
    svn:mime-type = application/java-archive

Added: geronimo/server/trunk/modules/geronimo-web-2.5-builder/repository/org/apache/myfaces/core/myfaces-api/1.2.0-SNAPSHOT/myfaces-api-1.2.0-SNAPSHOT.jar.md5
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-web-2.5-builder/repository/org/apache/myfaces/core/myfaces-api/1.2.0-SNAPSHOT/myfaces-api-1.2.0-SNAPSHOT.jar.md5?view=auto&rev=486169
==============================================================================
--- geronimo/server/trunk/modules/geronimo-web-2.5-builder/repository/org/apache/myfaces/core/myfaces-api/1.2.0-SNAPSHOT/myfaces-api-1.2.0-SNAPSHOT.jar.md5
(added)
+++ geronimo/server/trunk/modules/geronimo-web-2.5-builder/repository/org/apache/myfaces/core/myfaces-api/1.2.0-SNAPSHOT/myfaces-api-1.2.0-SNAPSHOT.jar.md5
Tue Dec 12 06:53:49 2006
@@ -0,0 +1 @@
+406fba6f674cdeedf9bcb92ca2a41cff *myfaces-api-1.2.0-SNAPSHOT.jar

Added: geronimo/server/trunk/modules/geronimo-web-2.5-builder/repository/org/apache/myfaces/core/myfaces-impl/1.2.0-SNAPSHOT/myfaces-impl-1.2.0-SNAPSHOT.jar
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-web-2.5-builder/repository/org/apache/myfaces/core/myfaces-impl/1.2.0-SNAPSHOT/myfaces-impl-1.2.0-SNAPSHOT.jar?view=auto&rev=486169
==============================================================================
Binary file - no diff available.

Propchange: geronimo/server/trunk/modules/geronimo-web-2.5-builder/repository/org/apache/myfaces/core/myfaces-impl/1.2.0-SNAPSHOT/myfaces-impl-1.2.0-SNAPSHOT.jar
------------------------------------------------------------------------------
    svn:mime-type = application/java-archive

Added: geronimo/server/trunk/modules/geronimo-web-2.5-builder/repository/org/apache/myfaces/core/myfaces-impl/1.2.0-SNAPSHOT/myfaces-impl-1.2.0-SNAPSHOT.jar.md5
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-web-2.5-builder/repository/org/apache/myfaces/core/myfaces-impl/1.2.0-SNAPSHOT/myfaces-impl-1.2.0-SNAPSHOT.jar.md5?view=auto&rev=486169
==============================================================================
--- geronimo/server/trunk/modules/geronimo-web-2.5-builder/repository/org/apache/myfaces/core/myfaces-impl/1.2.0-SNAPSHOT/myfaces-impl-1.2.0-SNAPSHOT.jar.md5
(added)
+++ geronimo/server/trunk/modules/geronimo-web-2.5-builder/repository/org/apache/myfaces/core/myfaces-impl/1.2.0-SNAPSHOT/myfaces-impl-1.2.0-SNAPSHOT.jar.md5
Tue Dec 12 06:53:49 2006
@@ -0,0 +1 @@
+40e5f70e05956beed1c03a18720b4b47 *myfaces-impl-1.2.0-SNAPSHOT.jar

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?view=diff&rev=486169&r1=486168&r2=486169
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Tue Dec 12 06:53:49 2006
@@ -1158,6 +1158,17 @@
                  </exclusions>
              </dependency>
 
+             <!--JSF 1.2 JARs from Apache MyFaces -->
+             <dependency>
+                 <groupId>org.apache.myfaces.core</groupId>
+                 <artifactId>myfaces-api</artifactId>
+                 <version>1.2.0-SNAPSHOT</version>
+             </dependency>
+             <dependency>
+                 <groupId>org.apache.myfaces.core</groupId>
+                 <artifactId>myfaces-impl</artifactId>
+                 <version>1.2.0-SNAPSHOT</version>
+             </dependency>
 
         </dependencies>
     </dependencyManagement>



Mime
View raw message