You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ba...@apache.org on 2007/05/27 21:54:15 UTC

svn commit: r542028 - in /myfaces/trinidad/branches/faces-1_2-070522/trinidad: ./ trinidad-api/ trinidad-build/ trinidad-demo/ trinidad-examples/blank/ trinidad-examples/blank/src/main/webapp/WEB-INF/ trinidad-examples/trinidad-demo/ trinidad-impl/

Author: baranda
Date: Sun May 27 12:54:14 2007
New Revision: 542028

URL: http://svn.apache.org/viewvc?view=rev&rev=542028
Log:
TRINIDAD-40 (Build Trinidad 2.0 using MyFaces 1.2 by default)

Modified:
    myfaces/trinidad/branches/faces-1_2-070522/trinidad/pom.xml
    myfaces/trinidad/branches/faces-1_2-070522/trinidad/trinidad-api/pom.xml
    myfaces/trinidad/branches/faces-1_2-070522/trinidad/trinidad-build/pom.xml
    myfaces/trinidad/branches/faces-1_2-070522/trinidad/trinidad-demo/pom.xml
    myfaces/trinidad/branches/faces-1_2-070522/trinidad/trinidad-examples/blank/pom.xml
    myfaces/trinidad/branches/faces-1_2-070522/trinidad/trinidad-examples/blank/src/main/webapp/WEB-INF/web.xml
    myfaces/trinidad/branches/faces-1_2-070522/trinidad/trinidad-examples/trinidad-demo/pom.xml
    myfaces/trinidad/branches/faces-1_2-070522/trinidad/trinidad-impl/pom.xml

Modified: myfaces/trinidad/branches/faces-1_2-070522/trinidad/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/faces-1_2-070522/trinidad/pom.xml?view=diff&rev=542028&r1=542027&r2=542028
==============================================================================
--- myfaces/trinidad/branches/faces-1_2-070522/trinidad/pom.xml (original)
+++ myfaces/trinidad/branches/faces-1_2-070522/trinidad/pom.xml Sun May 27 12:54:14 2007
@@ -356,14 +356,28 @@
       <dependency>
         <groupId>javax.faces</groupId>
         <artifactId>jsf-api</artifactId>
-        <version>1.2-b19</version>
+        <version>1.2_04</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>javax.faces</groupId>
         <artifactId>jsf-impl</artifactId>
-        <version>1.2-b19</version>
+        <version>1.2_04</version>
+        <scope>provided</scope>
+      </dependency>
+
+      <dependency>
+        <groupId>org.apache.myfaces.core</groupId>
+        <artifactId>myfaces-api</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
+        <scope>provided</scope>
+      </dependency>
+
+      <dependency>
+        <groupId>org.apache.myfaces.core</groupId>
+        <artifactId>myfaces-impl</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
         <scope>provided</scope>
       </dependency>
 
@@ -372,26 +386,7 @@
         <artifactId>shale-test</artifactId>
         <version>1.0.4</version>
         <scope>test</scope>
-	<!-- Ignore the references to myfaces and the JSP API -->
-	<!-- We could force shale to JSF RI 1.2, but it's better
-	     this way - Shale isn't marking JSF 1.2 as provided,
-	     so it's pulling in its own version -->
-        <exclusions>
-          <exclusion>
-            <groupId>myfaces</groupId>
-            <artifactId>myfaces-api</artifactId>
-          </exclusion>
-
-          <exclusion>
-            <groupId>myfaces</groupId>
-            <artifactId>myfaces-impl</artifactId>
-          </exclusion>
 
-          <exclusion>
-            <groupId>javax.servlet</groupId>
-            <artifactId>jsp-api</artifactId>
-          </exclusion>
-        </exclusions>
       </dependency>
 
       <dependency>

Modified: myfaces/trinidad/branches/faces-1_2-070522/trinidad/trinidad-api/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/faces-1_2-070522/trinidad/trinidad-api/pom.xml?view=diff&rev=542028&r1=542027&r2=542028
==============================================================================
--- myfaces/trinidad/branches/faces-1_2-070522/trinidad/trinidad-api/pom.xml (original)
+++ myfaces/trinidad/branches/faces-1_2-070522/trinidad/trinidad-api/pom.xml Sun May 27 12:54:14 2007
@@ -91,6 +91,7 @@
         <configuration>
           <typePrefix>org.apache</typePrefix>
           <packageContains>org.apache</packageContains>
+          <jsfVersion>1.2</jsfVersion>
           <!--suppressListenerMethods>true</suppressListenerMethods-->
           <force>true</force>
         </configuration>
@@ -141,8 +142,8 @@
     </dependency>
 
     <dependency>
-      <groupId>javax.faces</groupId>
-      <artifactId>jsf-api</artifactId>
+      <groupId>org.apache.myfaces.core</groupId>
+      <artifactId>myfaces-api</artifactId>
     </dependency>
 
     <!-- "test" scope dependencies -->

Modified: myfaces/trinidad/branches/faces-1_2-070522/trinidad/trinidad-build/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/faces-1_2-070522/trinidad/trinidad-build/pom.xml?view=diff&rev=542028&r1=542027&r2=542028
==============================================================================
--- myfaces/trinidad/branches/faces-1_2-070522/trinidad/trinidad-build/pom.xml (original)
+++ myfaces/trinidad/branches/faces-1_2-070522/trinidad/trinidad-build/pom.xml Sun May 27 12:54:14 2007
@@ -39,6 +39,7 @@
             <exclude>**/includes/**</exclude>
           </excludes>
           <force>true</force>
+          <jsfVersion>1.2</jsfVersion>
         </configuration>
         <executions>
           <execution>

Modified: myfaces/trinidad/branches/faces-1_2-070522/trinidad/trinidad-demo/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/faces-1_2-070522/trinidad/trinidad-demo/pom.xml?view=diff&rev=542028&r1=542027&r2=542028
==============================================================================
--- myfaces/trinidad/branches/faces-1_2-070522/trinidad/trinidad-demo/pom.xml (original)
+++ myfaces/trinidad/branches/faces-1_2-070522/trinidad/trinidad-demo/pom.xml Sun May 27 12:54:14 2007
@@ -105,15 +105,15 @@
       <dependencies>
 
         <dependency>
-          <groupId>javax.faces</groupId>
-          <artifactId>jsf-api</artifactId>
+          <groupId>org.apache.myfaces.core</groupId>
+          <artifactId>myfaces-api</artifactId>
           <scope>provided</scope>
         </dependency>
 
 
         <dependency>
-          <groupId>javax.faces</groupId>
-          <artifactId>jsf-impl</artifactId>
+          <groupId>org.apache.myfaces.core</groupId>
+          <artifactId>myfaces-impl</artifactId>
           <scope>provided</scope>
         </dependency>
       </dependencies>

Modified: myfaces/trinidad/branches/faces-1_2-070522/trinidad/trinidad-examples/blank/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/faces-1_2-070522/trinidad/trinidad-examples/blank/pom.xml?view=diff&rev=542028&r1=542027&r2=542028
==============================================================================
--- myfaces/trinidad/branches/faces-1_2-070522/trinidad/trinidad-examples/blank/pom.xml (original)
+++ myfaces/trinidad/branches/faces-1_2-070522/trinidad/trinidad-examples/blank/pom.xml Sun May 27 12:54:14 2007
@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.apache.myfaces.trinidad</groupId>
     <artifactId>trinidad</artifactId>
-    <version>1.0.0-incubating</version>
+    <version>1.2-07-may-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -30,68 +30,102 @@
 
 
   <!-- Profile to run jetty, so the tomcat jars are included in the bundle. They are not included by default -->
-  <profiles>
-    <profile>
-      <id>jettyConfig</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.mortbay.jetty</groupId>
-            <artifactId>maven-jetty-plugin</artifactId>
-            <version>6.1.0</version>
-            <configuration>
-              <connectors>
-                <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
-                <port>8181</port>
-                <maxIdleTime>60000</maxIdleTime>
-              </connector>
-              </connectors>            
-              <scanIntervalSeconds>2</scanIntervalSeconds>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-
-      <dependencies>
-        <dependency>
-          <groupId>javax.servlet</groupId>
-          <artifactId>jsp-api</artifactId>
-          <version>2.0</version>
-          <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-          <groupId>tomcat</groupId>
-          <artifactId>jasper-compiler</artifactId>
-          <version>5.5.9</version>
-          <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-          <groupId>tomcat</groupId>
-          <artifactId>jasper-runtime</artifactId>
-          <version>5.5.9</version>
-          <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-          <groupId>tomcat</groupId>
-          <artifactId>jasper-compiler-jdt</artifactId>
-          <version>5.5.9</version>
-          <scope>compile</scope>
-        </dependency>
-      </dependencies>
-
-      <pluginRepositories>
-      <!-- Repository to get the jetty plugin -->
-        <pluginRepository>
-          <id>mortbay-repo</id>
-          <name>mortbay-repo</name>
-          <url>http://www.mortbay.org/maven2/snapshot</url>
-        </pluginRepository>
-      </pluginRepositories>
-
-    </profile>
+    <profiles>
+        <profile>
+            <id>jettyConfig</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.mortbay.jetty</groupId>
+                        <artifactId>maven-jetty-plugin</artifactId>
+                        <version>6.1.2rc0</version>
+                        <configuration>
+                            <scanIntervalSeconds>10</scanIntervalSeconds>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+        <profile>
+            <id>myfaces-1.2</id>
+            <activation>
+                <property>
+                    <name>!jsf</name>
+                </property>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.apache.myfaces.core</groupId>
+                    <artifactId>myfaces-api</artifactId>
+                    <scope>compile</scope>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.myfaces.core</groupId>
+                    <artifactId>myfaces-impl</artifactId>
+                    <!-- Tomahawk examples must only have runtime dependency to myfaces-impl
+                 so that it will be automatically added to war. But there must not be
+                 any compile dependency on impl so that is is always possible to use
+                 other JSF implementations. -->
+                    <scope>compile</scope>
+                </dependency>
+                <dependency>
+                    <groupId>jstl</groupId>
+                    <artifactId>jstl</artifactId>
+                    <version>1.2</version>
+                </dependency>
+                <dependency>
+                    <groupId>taglibs</groupId>
+                    <artifactId>standard</artifactId>
+                    <version>1.1.2</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-el_1.0_spec</artifactId>
+                    <version>1.0-M1</version>
+                    <scope>provided</scope>
+                </dependency>
+            </dependencies>
+        </profile>
+
+
+       <!-- To use the examples using the Sun's JSF Reference Implementation 1.2 : -Djsf=ri12 -->
+        <profile>
+            <id>jsfri</id>
+            <activation>
+                <property>
+                    <name>jsf</name>
+                    <value>ri</value>
+                </property>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>javax.faces</groupId>
+                    <artifactId>jsf-api</artifactId>
+                    <scope>compile</scope>
+                </dependency>
+                <dependency>
+                    <groupId>javax.faces</groupId>
+                    <artifactId>jsf-impl</artifactId>
+                    <scope>compile</scope>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-el_1.0_spec</artifactId>
+                    <version>1.0-M1</version>
+                    <scope>provided</scope>
+                </dependency>
+            </dependencies>
+
+            <repositories>
+                <repository>
+                    <id>java.net</id>
+                    <name>java.net Maven 1 Repository</name>
+                    <url>https://maven-repository.dev.java.net/nonav/repository</url>
+                    <layout>legacy</layout>
+                </repository>
+            </repositories>
+        </profile>
   </profiles>
 
   <repositories>
@@ -109,39 +143,26 @@
 
   <!-- Project dependencies -->
   <dependencies>
-    <dependency>
-      <groupId>org.apache.myfaces.core</groupId>
-      <artifactId>myfaces-api</artifactId>
-      <version>1.1.5</version>
-      <scope>compile</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.myfaces.core</groupId>
-      <artifactId>myfaces-impl</artifactId>
-      <version>1.1.5</version>
-      <scope>compile</scope>
-    </dependency>
 
     <!-- Apache Trinidad -->
     <dependency>
       <groupId>org.apache.myfaces.trinidad</groupId>
       <artifactId>trinidad-api</artifactId>
-      <version>1.0.0-incubating</version>
+      <version>1.2-07-may-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
 
     <dependency>
       <groupId>org.apache.myfaces.trinidad</groupId>
       <artifactId>trinidad-impl</artifactId>
-      <version>1.0.0-incubating</version>
+      <version>1.2-07-may-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
 
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.0</version>
+      <version>4.3.1</version>
       <scope>test</scope>
     </dependency>
 

Modified: myfaces/trinidad/branches/faces-1_2-070522/trinidad/trinidad-examples/blank/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/faces-1_2-070522/trinidad/trinidad-examples/blank/src/main/webapp/WEB-INF/web.xml?view=diff&rev=542028&r1=542027&r2=542028
==============================================================================
--- myfaces/trinidad/branches/faces-1_2-070522/trinidad/trinidad-examples/blank/src/main/webapp/WEB-INF/web.xml (original)
+++ myfaces/trinidad/branches/faces-1_2-070522/trinidad/trinidad-examples/blank/src/main/webapp/WEB-INF/web.xml Sun May 27 12:54:14 2007
@@ -81,10 +81,6 @@
     <servlet-name>faces</servlet-name>
   </filter-mapping>
 
-  <!-- Listener, to allow Jetty serving MyFaces apps -->
-  <listener>
-    <listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>
-  </listener>
 
   <!-- Faces Servlet -->
   <servlet>

Modified: myfaces/trinidad/branches/faces-1_2-070522/trinidad/trinidad-examples/trinidad-demo/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/faces-1_2-070522/trinidad/trinidad-examples/trinidad-demo/pom.xml?view=diff&rev=542028&r1=542027&r2=542028
==============================================================================
--- myfaces/trinidad/branches/faces-1_2-070522/trinidad/trinidad-examples/trinidad-demo/pom.xml (original)
+++ myfaces/trinidad/branches/faces-1_2-070522/trinidad/trinidad-examples/trinidad-demo/pom.xml Sun May 27 12:54:14 2007
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.myfaces.trinidad</groupId>
     <artifactId>trinidad</artifactId>
-    <version>1.0.0-incubating</version>
+    <version>1.2-07-may-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
@@ -121,7 +121,23 @@
   </dependencies>
 
   <profiles>
-    <!-- By default the war examples use myfaces! :) -->
+     <profile>
+       <id>jettyConfig</id>
+       <build>
+         <plugins>
+           <plugin>
+             <groupId>org.mortbay.jetty</groupId>
+             <artifactId>maven-jetty-plugin</artifactId>
+             <version>6.1.2rc0</version>
+             <configuration>
+               <scanIntervalSeconds>10</scanIntervalSeconds>
+             </configuration>
+           </plugin>
+        </plugins>
+      </build>
+    </profile>
+
+        <!-- By default the war examples use myfaces! :) -->
     <profile>
       <id>myfaces</id>
       <activation>
@@ -134,19 +150,17 @@
         <dependency>
           <groupId>org.apache.myfaces.core</groupId>
           <artifactId>myfaces-api</artifactId>
+          <version>1.2.0-SNAPSHOT</version>
           <scope>compile</scope>
         </dependency>
 
         <dependency>
           <groupId>org.apache.myfaces.core</groupId>
           <artifactId>myfaces-impl</artifactId>
+          <version>1.2.0-SNAPSHOT</version>
           <scope>runtime</scope>
         </dependency>
       </dependencies>
-      
-      <properties>
-        <jsf_implementation>MyFaces</jsf_implementation>
-      </properties>
     </profile>
 
     <!-- To use the examples using the Sun's JSF Reference Implementation: -Djsf=ri -->
@@ -162,29 +176,14 @@
         <dependency>
           <groupId>javax.faces</groupId>
           <artifactId>jsf-api</artifactId>
-          <version>1.1_02</version>
+          <version>1.2_04</version>
         </dependency>
         <dependency>
           <groupId>javax.faces</groupId>
           <artifactId>jsf-impl</artifactId>
-          <version>1.1_02</version>
+          <version>1.2_04</version>
           <scope>runtime</scope>
         </dependency>
-
-        <dependency>
-          <groupId>jstl</groupId>
-          <artifactId>jstl</artifactId>
-          <version>1.1.0</version>
-          <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-          <groupId>commons-digester</groupId>
-          <artifactId>commons-digester</artifactId>
-          <version>1.5</version>
-          <scope>runtime</scope>
-        </dependency>
-
       </dependencies>
 
       <repositories>

Modified: myfaces/trinidad/branches/faces-1_2-070522/trinidad/trinidad-impl/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/faces-1_2-070522/trinidad/trinidad-impl/pom.xml?view=diff&rev=542028&r1=542027&r2=542028
==============================================================================
--- myfaces/trinidad/branches/faces-1_2-070522/trinidad/trinidad-impl/pom.xml (original)
+++ myfaces/trinidad/branches/faces-1_2-070522/trinidad/trinidad-impl/pom.xml Sun May 27 12:54:14 2007
@@ -14,7 +14,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<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"> 
+<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">
   <parent>
     <groupId>org.apache.myfaces.trinidad</groupId>
     <artifactId>trinidad</artifactId>
@@ -204,15 +204,15 @@
       <groupId>org.apache.myfaces.trinidad</groupId>
       <artifactId>trinidad-build</artifactId>
     </dependency>
-    
+
     <dependency>
       <groupId>org.apache.myfaces.trinidad</groupId>
       <artifactId>trinidad-api</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>javax.faces</groupId>
-      <artifactId>jsf-api</artifactId>
+      <groupId>org.apache.myfaces.core</groupId>
+      <artifactId>myfaces-api</artifactId>
     </dependency>
 
     <!-- "test" scope dependencies -->
@@ -222,7 +222,7 @@
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
- 
+
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>