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/11/22 05:18:36 UTC
svn commit: r719802 - in
/myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources:
META-INF/maven/ archetype-resources/
archetype-resources/src/main/webapp/WEB-INF/
Author: lu4242
Date: Fri Nov 21 20:18:36 2008
New Revision: 719802
URL: http://svn.apache.org/viewvc?rev=719802&view=rev
Log:
update archetype to latest myfaces versions
Removed:
myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/tomahawk.taglib.xml
Modified:
myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/META-INF/maven/archetype.xml
myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/pom.xml
myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
Modified: myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/META-INF/maven/archetype.xml
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/META-INF/maven/archetype.xml?rev=719802&r1=719801&r2=719802&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/META-INF/maven/archetype.xml (original)
+++ myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/META-INF/maven/archetype.xml Fri Nov 21 20:18:36 2008
@@ -11,7 +11,6 @@
<resources>
<resource>pom.xml</resource>
<resource>src/main/webapp/WEB-INF/examples-config.xml</resource>
- <resource>src/main/webapp/WEB-INF/tomahawk.taglib.xml</resource>
<resource>src/main/webapp/WEB-INF/web.xml</resource>
<resource>src/main/webapp/helloWorld.xhtml</resource>
<resource>src/main/webapp/index.jsp</resource>
Modified: myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/pom.xml?rev=719802&r1=719801&r2=719802&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/pom.xml (original)
+++ myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/pom.xml Fri Nov 21 20:18:36 2008
@@ -49,42 +49,43 @@
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
- <version>1.2.4</version>
+ <version>1.2.5</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-impl</artifactId>
- <version>1.2.4</version>
+ <version>1.2.5</version>
<scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <!-- Temporal fix to avoid transitive dependency to shared -->
+ <groupId>org.apache.myfaces.shared</groupId>
+ <artifactId>myfaces-shared-impl</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.myfaces.tomahawk</groupId>
<artifactId>tomahawk</artifactId>
- <version>1.1.6</version>
+ <version>1.1.8</version>
<scope>runtime</scope>
- <exclusions>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
- <groupId>jstl</groupId>
+ <groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
<version>1.2</version>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>com.sun.facelets</groupId>
- <artifactId>jsf-facelets</artifactId>
- <version>1.1.11</version>
- </dependency>
+ <groupId>com.sun.facelets</groupId>
+ <artifactId>jsf-facelets</artifactId>
+ <version>1.1.14</version>
+ </dependency>
<dependency>
<groupId>junit</groupId>
Modified: myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-facelets/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-helloworld-facelets/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml?rev=719802&r1=719801&r2=719802&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml (original)
+++ myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml Fri Nov 21 20:18:36 2008
@@ -32,12 +32,6 @@
<param-value>true</param-value>
</context-param>
- <!-- Configure tomahawk taglib -->
- <context-param>
- <param-name>facelets.LIBRARIES</param-name>
- <param-value>/WEB-INF/tomahawk.taglib.xml</param-value>
- </context-param>
-
<!-- Use Documents Saved as *.xhtml -->
<context-param>
<param-name>javax.faces.DEFAULT_SUFFIX</param-name>
@@ -255,13 +249,6 @@
<url-pattern>/faces/*</url-pattern>
</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</servlet-name>