You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2008/01/24 21:27:23 UTC
svn commit: r614979 [2/2] - in
/myfaces/myfaces-build-tools/trunk/maven2-archetypes: ./
myfaces-archetype-helloworld-facelets/
myfaces-archetype-helloworld-facelets/src/
myfaces-archetype-helloworld-facelets/src/main/
myfaces-archetype-helloworld-facel...
Modified: myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/pom.xml?rev=614979&r1=614978&r2=614979&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/pom.xml (original)
+++ myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/pom.xml Thu Jan 24 12:27:18 2008
@@ -28,8 +28,23 @@
<version>1.0.4</version>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>jstl</groupId>
+ <artifactId>jstl</artifactId>
+ <version>1.2</version>
+ <scope>runtime</scope>
+ </dependency>
+
</dependencies>
+ <repositories>
+ <!-- Repository for jstl 1.2 -->
+ <repository>
+ <id>java.net</id>
+ <url>http://download.java.net/maven/1</url>
+ <layout>legacy</layout>
+ </repository>
+ </repositories>
<profiles>
<!-- By default the war examples use myfaces! :) -->
@@ -44,12 +59,12 @@
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
- <version>1.1.4</version>
+ <version>1.2.2</version>
</dependency>
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-impl</artifactId>
- <version>1.1.4</version>
+ <version>1.2.2</version>
<!-- Sandbox 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
@@ -84,13 +99,14 @@
<version>1.1_02</version>
<scope>runtime</scope>
</dependency>
-
+ <!--
<dependency>
<groupId>jstl</groupId>
<artifactId>jstl</artifactId>
<version>1.1.0</version>
<scope>compile</scope>
</dependency>
+ -->
</dependencies>
<repositories>
Modified: myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/archetype-resources/pom.xml?rev=614979&r1=614978&r2=614979&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/archetype-resources/pom.xml (original)
+++ myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/archetype-resources/pom.xml Thu Jan 24 12:27:18 2008
@@ -103,6 +103,11 @@
<id>apache-maven-snapshots</id>
<url>http://people.apache.org/repo/m2-incubating-repository/</url>
</repository>
+ <repository>
+ <id>java.net</id>
+ <url>http://download.java.net/maven/1</url>
+ <layout>legacy</layout>
+ </repository>
</repositories>
<!-- Project dependencies -->
@@ -135,7 +140,12 @@
<version>${trinidad.version}</version>
<scope>compile</scope>
</dependency>
-
+ <dependency>
+ <groupId>jstl</groupId>
+ <artifactId>jstl</artifactId>
+ <version>1.2</version>
+ <scope>runtime</scope>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -146,8 +156,8 @@
</dependencies>
<properties>
- <trinidad.version>1.0.4</trinidad.version>
- <myfaces.version>1.1.5</myfaces.version>
+ <trinidad.version>1.2.5</trinidad.version>
+ <myfaces.version>1.2.2</myfaces.version>
</properties>
</project>
Modified: myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml?rev=614979&r1=614978&r2=614979&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml (original)
+++ myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml Thu Jan 24 12:27:18 2008
@@ -18,10 +18,11 @@
under the License.
-->
-<!DOCTYPE faces-config PUBLIC
- "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.0//EN"
- "http://java.sun.com/dtd/web-facesconfig_1_0.dtd" >
-<faces-config>
+<faces-config version="1.2"
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd">
<application>
<!-- Use the Trinidad RenderKit -->
Modified: myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml?rev=614979&r1=614978&r2=614979&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml (original)
+++ myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml Thu Jan 24 12:27:18 2008
@@ -81,11 +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>
<servlet-name>faces</servlet-name>
@@ -112,7 +107,7 @@
<!-- Welcome Files -->
<welcome-file-list>
- <welcome-file>index.jspx</welcome-file>
+ <welcome-file>faces/index.jspx</welcome-file>
</welcome-file-list>
</web-app>