You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ja...@apache.org on 2010/09/04 18:31:21 UTC
svn commit: r992633 - in
/myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources:
META-INF/maven/ archetype-resources/ archetype-resources/src/main/webapp/
archetype-resources/src/main/webapp/WEB-INF/
Author: jakobk
Date: Sat Sep 4 16:31:21 2010
New Revision: 992633
URL: http://svn.apache.org/viewvc?rev=992633&view=rev
Log:
MYFACES-2909 Update archetypes to fit Archetype plugin 2.0.x (myfaces-archetype-trinidad)
Added:
myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/META-INF/maven/archetype-metadata.xml
- copied, changed from r992618, myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/META-INF/maven/archetype.xml
myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/archetype-resources/src/main/webapp/index.jsp
- copied, changed from r992618, myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/archetype-resources/src/main/webapp/index.jsp
Removed:
myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/META-INF/maven/archetype.xml
Modified:
myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/archetype-resources/pom.xml
myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
Copied: myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/META-INF/maven/archetype-metadata.xml (from r992618, myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/META-INF/maven/archetype.xml)
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/META-INF/maven/archetype-metadata.xml?p2=myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/META-INF/maven/archetype-metadata.xml&p1=myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/META-INF/maven/archetype.xml&r1=992618&r2=992633&rev=992633&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/META-INF/maven/archetype.xml (original)
+++ myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/META-INF/maven/archetype-metadata.xml Sat Sep 4 16:31:21 2010
@@ -17,19 +17,36 @@
specific language governing permissions and limitations
under the License.
-->
-<archetype xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype/1.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype/1.0.0 http://maven.apache.org/xsd/archetype-1.0.0.xsd">
-
- <id>myfaces-archetype-trinidad</id>
- <sources>
- <source>src/main/java/HelloWorldBacking.java</source>
- </sources>
- <resources>
- <resource>src/main/log4j/log4j.properties</resource>
- <resource>src/main/webapp/index.jspx</resource>
- <resource>src/main/webapp/page2.jspx</resource>
- <resource>src/main/webapp/WEB-INF/web.xml</resource>
- <resource>src/main/webapp/WEB-INF/faces-config.xml</resource>
- </resources>
-</archetype>
\ No newline at end of file
+<archetype-descriptor xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0 http://maven.apache.org/xsd/archetype-descriptor-1.0.0.xsd"
+
+ name="myfaces-archetype-trinidad" partial="false">
+
+ <requiredProperties/>
+
+ <fileSets>
+ <fileSet filtered="true" packaged="true">
+ <directory>src/main/java/</directory>
+ </fileSet>
+ <fileSet filtered="false" packaged="false">
+ <directory>src/main/webapp/</directory>
+ <excludes>
+ <exclude>WEB-INF/faces-config.xml</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet filtered="true" packaged="false">
+ <directory>src/main/webapp/</directory>
+ <includes>
+ <!-- faces-config needs to be filtered -->
+ <include>WEB-INF/faces-config.xml</include>
+ </includes>
+ </fileSet>
+ <fileSet filtered="false" packaged="false">
+ <directory>src/main/log4j/</directory>
+ </fileSet>
+ </fileSets>
+
+ <modules/>
+
+</archetype-descriptor>
\ No newline at end of file
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=992633&r1=992632&r2=992633&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 Sat Sep 4 16:31:21 2010
@@ -1,3 +1,6 @@
+#set( $symbol_pound = '#' )
+#set( $symbol_dollar = '$' )
+#set( $symbol_escape = '\' )
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
@@ -26,14 +29,14 @@
<artifactId>${artifactId}</artifactId>
<packaging>war</packaging>
<version>${version}</version>
- <name>A custom project using myfaces</name>
+ <name>A custom project using myfaces 1.2 with trinidad</name>
<url>http://www.myorganization.org</url>
<properties>
- <jsf-myfaces.version>1.2.7</jsf-myfaces.version>
- <jsf-ri.version>1.2_13</jsf-ri.version>
- <trinidad.version>1.2.11</trinidad.version>
- <maven.jetty.plugin.version>6.1.16</maven.jetty.plugin.version>
+ <jsf-myfaces.version>1.2.9</jsf-myfaces.version>
+ <jsf-ri.version>1.2_15</jsf-ri.version>
+ <trinidad.version>1.2.13</trinidad.version>
+ <maven.jetty.plugin.version>6.1.22</maven.jetty.plugin.version>
<log4j.version>1.2.13</log4j.version>
</properties>
@@ -44,7 +47,7 @@
<!--This plugin allows to run the example using mvn jetty:run -->
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
- <version>${maven.jetty.plugin.version}</version>
+ <version>${symbol_dollar}{maven.jetty.plugin.version}</version>
<configuration>
<scanIntervalSeconds>10</scanIntervalSeconds>
</configuration>
@@ -64,14 +67,14 @@
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
- <version>${jsf-myfaces.version}</version>
+ <version>${symbol_dollar}{jsf-myfaces.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-impl</artifactId>
- <version>${jsf-myfaces.version}</version>
- <scope>compile</scope>
+ <version>${symbol_dollar}{jsf-myfaces.version}</version>
+ <scope>runtime</scope>
</dependency>
</dependencies>
</profile>
@@ -88,14 +91,23 @@
<dependency>
<groupId>javax.faces</groupId>
<artifactId>jsf-api</artifactId>
- <version>${jsf-ri.version}</version>
+ <version>${symbol_dollar}{jsf-ri.version}</version>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>javax.faces</groupId>
<artifactId>jsf-impl</artifactId>
- <version>${jsf-ri.version}</version>
+ <version>${symbol_dollar}{jsf-ri.version}</version>
+ <scope>runtime</scope>
</dependency>
</dependencies>
+ <repositories>
+ <repository>
+ <id>java.net</id>
+ <url>http://download.java.net/maven/1</url>
+ <layout>legacy</layout>
+ </repository>
+ </repositories>
</profile>
<profile>
@@ -116,7 +128,7 @@
<!--This plugin allows to run the example using mvn jetty:run -->
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
- <version>${maven.jetty.plugin.version}</version>
+ <version>${symbol_dollar}{maven.jetty.plugin.version}</version>
<configuration>
<scanIntervalSeconds>10</scanIntervalSeconds>
<systemProperties>
@@ -133,31 +145,13 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>${log4j.version}</version>
+ <version>${symbol_dollar}{log4j.version}</version>
<type>jar</type>
</dependency>
</dependencies>
</profile>
</profiles>
- <repositories>
- <repository>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <id>apache-maven-snapshots</id>
- <url>http://people.apache.org/repo/m2-snapshot-repository</url>
- </repository>
- <repository>
- <id>java.net</id>
- <url>http://download.java.net/maven/1</url>
- <layout>legacy</layout>
- </repository>
- </repositories>
-
<!-- Project dependencies -->
<dependencies>
@@ -165,15 +159,15 @@
<dependency>
<groupId>org.apache.myfaces.trinidad</groupId>
<artifactId>trinidad-api</artifactId>
- <version>${trinidad.version}</version>
+ <version>${symbol_dollar}{trinidad.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.myfaces.trinidad</groupId>
<artifactId>trinidad-impl</artifactId>
- <version>${trinidad.version}</version>
- <scope>compile</scope>
+ <version>${symbol_dollar}{trinidad.version}</version>
+ <scope>runtime</scope>
</dependency>
<dependency>
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=992633&r1=992632&r2=992633&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 Sat Sep 4 16:31:21 2010
@@ -107,7 +107,7 @@
<!-- Welcome Files -->
<welcome-file-list>
- <welcome-file>faces/index.jspx</welcome-file>
+ <welcome-file>index.jsp</welcome-file>
</welcome-file-list>
</web-app>
\ No newline at end of file
Copied: myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/archetype-resources/src/main/webapp/index.jsp (from r992618, myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/archetype-resources/src/main/webapp/index.jsp)
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/archetype-resources/src/main/webapp/index.jsp?p2=myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/archetype-resources/src/main/webapp/index.jsp&p1=myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/archetype-resources/src/main/webapp/index.jsp&r1=992618&r2=992633&rev=992633&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/archetype-resources/src/main/webapp/index.jsp (original)
+++ myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/archetype-resources/src/main/webapp/index.jsp Sat Sep 4 16:31:21 2010
@@ -18,5 +18,5 @@
--%>
<%@ page session="false"%>
<%
-response.sendRedirect("helloWorld.jsf");
+response.sendRedirect("faces/index.jspx");
%>
\ No newline at end of file