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 2012/03/09 22:36:29 UTC
svn commit: r1299062 [3/3] - in
/myfaces/myfaces-build-tools/trunk/maven2-archetypes: ./
myfaces-archetype-codi-jsf20/src/main/resources/archetype-resources/
myfaces-archetype-helloworld20-debug/
myfaces-archetype-helloworld20-debug/src/ myfaces-archet...
Modified: myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld20/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld20/src/main/resources/archetype-resources/pom.xml?rev=1299062&r1=1299061&r2=1299062&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld20/src/main/resources/archetype-resources/pom.xml (original)
+++ myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld20/src/main/resources/archetype-resources/pom.xml Fri Mar 9 21:36:28 2012
@@ -30,13 +30,24 @@
<artifactId>${artifactId}</artifactId>
<packaging>war</packaging>
<version>${version}</version>
- <name>A custom project using MyFaces 2.0</name>
+ <name>${artifactId}</name>
+ <description>A custom project using MyFaces 2.0</description>
<url>http://www.myorganization.org</url>
+ <!-- Instructions
+ - Run using jetty
+ mvn clean jetty:run
+ mvn clean -Dcontainer=jetty-mojarra jetty:run
+ Set your browser to http://localhost:8080/${artifactId}
+ - Build war and bundle JSF jars
+ mvn clean -Pbundle-myfaces install
+ mvn clean -Pbundle-mojarra install
+ -->
+
<properties>
- <jsf-myfaces.version>2.0.5</jsf-myfaces.version>
- <jsf-mojarra.version>2.0.5-b02</jsf-mojarra.version>
- <maven.jetty.plugin.version>6.1.22</maven.jetty.plugin.version>
+ <jsf-myfaces.version>2.0.12</jsf-myfaces.version>
+ <jsf-mojarra.version>2.0.9</jsf-mojarra.version>
+ <jetty.maven.plugin.version>8.1.1.v20120215</jetty.maven.plugin.version>
</properties>
<build>
@@ -53,14 +64,66 @@
</plugins>
</build>
+ <!-- Project dependencies -->
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
+ <version>1.2</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-el_2.2_spec</artifactId>
+ <version>1.0.2</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.0_spec</artifactId>
+ <version>1.1.1</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- JSF API: Add here as provided dependency and then add it
+ on jetty-maven-plugin as compile/runtime dependency.
+ The same goes for other JSF libraries. -->
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <version>${symbol_dollar}{jsf-myfaces.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ <version>1.2</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.8.2</version>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+
<profiles>
<profile>
- <id>myfaces</id>
+ <id>bundle-myfaces</id>
<activation>
<property>
- <name>!jsf</name>
+ <name>jsf</name>
+ <value>myfaces</value>
</property>
</activation>
+ <!-- Include MyFaces jars into the war -->
<dependencies>
<dependency>
<groupId>org.apache.myfaces.core</groupId>
@@ -78,14 +141,70 @@
</profile>
<profile>
- <!-- Activate by adding -Djsf=mojarra -->
- <id>mojarra</id>
+ <!-- Plugin embedded jetty 8 container.
+ Just running use:
+ mvn clean jetty:run
+ -->
+ <!-- For debugging use (attach debugger port 8000):
+ mvnDebug clean jetty:run
+ -->
+ <id>jettyConfig</id>
+ <activation>
+ <property>
+ <name>!container</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <!--This plugin allows to run the war using mvn jetty:run -->
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-maven-plugin</artifactId>
+ <version>${symbol_dollar}{jetty.maven.plugin.version}</version>
+ <configuration>
+ <systemProperties>
+ <systemProperty>
+ <!-- optional to use the ecj compiler -->
+ <name>org.apache.jasper.compiler.disablejsr199</name>
+ <value>true</value>
+ </systemProperty>
+ </systemProperties>
+ <webApp>
+ <contextPath>/${artifactId}</contextPath>
+ </webApp>
+ <scanIntervalSeconds>5</scanIntervalSeconds>
+ </configuration>
+ <dependencies>
+ <!-- Tld scanning only works when JSF is included
+ as container dependency. Add other jsf libraries
+ here, so jetty:run goal can find and process them -->
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <version>${symbol_dollar}{jsf-myfaces.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-impl</artifactId>
+ <version>${symbol_dollar}{jsf-myfaces.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <profile>
+ <id>bundle-mojarra</id>
<activation>
<property>
<name>jsf</name>
<value>mojarra</value>
</property>
</activation>
+ <!-- Include Mojarra jars into the war -->
<dependencies>
<dependency>
<groupId>com.sun.faces</groupId>
@@ -109,41 +228,67 @@
</profile>
<profile>
- <!-- Use mvn clean jetty:run-exploded -PjettyConfig to run with jetty -->
- <id>jettyConfig</id>
+ <!-- Plugin embedded jetty 8 container.
+ Just running use:
+ mvn clean -Dcontainer=jetty-mojarra jetty:run
+ -->
+ <!-- For debugging use (attach debugger port 8000):
+ mvn clean -Dcontainer=jetty-mojarra jetty:run
+ -->
+ <id>jettyConfig-mojarra</id>
+ <activation>
+ <property>
+ <name>container</name>
+ <value>jetty-mojarra</value>
+ </property>
+ </activation>
<build>
<plugins>
<plugin>
<!--This plugin allows to run the war using mvn jetty:run -->
<groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
- <version>${symbol_dollar}{maven.jetty.plugin.version}</version>
+ <artifactId>jetty-maven-plugin</artifactId>
+ <version>${symbol_dollar}{jetty.maven.plugin.version}</version>
<configuration>
- <scanIntervalSeconds>10</scanIntervalSeconds>
+ <systemProperties>
+ <systemProperty>
+ <!-- optional to use the ecj compiler -->
+ <name>org.apache.jasper.compiler.disablejsr199</name>
+ <value>true</value>
+ </systemProperty>
+ </systemProperties>
+ <webApp>
+ <contextPath>/${artifactId}</contextPath>
+ </webApp>
+ <scanIntervalSeconds>5</scanIntervalSeconds>
</configuration>
+ <dependencies>
+ <!-- Tld scanning only works when JSF is included
+ as container dependency. Add other jsf libraries
+ here, so jetty:run goal can find and process them -->
+ <dependency>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <version>${symbol_dollar}{jsf-mojarra.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ <version>${symbol_dollar}{jsf-mojarra.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
</plugin>
</plugins>
</build>
+ <repositories>
+ <repository>
+ <id>java.net</id>
+ <url>http://download.java.net/maven/2</url>
+ </repository>
+ </repositories>
</profile>
</profiles>
- <!-- Project dependencies -->
- <dependencies>
-
- <dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.0</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
</project>
Modified: myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-jsfcomponents20/src/main/resources/archetype-resources/core/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-jsfcomponents20/src/main/resources/archetype-resources/core/pom.xml?rev=1299062&r1=1299061&r2=1299062&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-jsfcomponents20/src/main/resources/archetype-resources/core/pom.xml (original)
+++ myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-jsfcomponents20/src/main/resources/archetype-resources/core/pom.xml Fri Mar 9 21:36:28 2012
@@ -32,11 +32,8 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>${artifactId}-core</artifactId>
<packaging>jar</packaging>
- <name>My JSF Components Library</name>
-
- <description>
- This is my super jsf components library.
- </description>
+ <name>${artifactId}-core</name>
+ <description>My Super JSF Components Library</description>
<properties>
<shortname>mycomponents</shortname>
@@ -55,14 +52,14 @@
<dependency>
<groupId>org.apache.myfaces.commons</groupId>
<artifactId>myfaces-validators20</artifactId>
- <version>1.0.1</version>
+ <version>1.0.2.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.myfaces.commons</groupId>
<artifactId>myfaces-converters20</artifactId>
- <version>1.0.1</version>
+ <version>1.0.2.1</version>
<scope>compile</scope>
</dependency>
@@ -81,17 +78,23 @@
</dependency>
<dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jsp_2.1_spec</artifactId>
<scope>provided</scope>
</dependency>
-
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-el_2.2_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
<dependency>
<groupId>org.apache.myfaces.buildtools</groupId>
<artifactId>myfaces-builder-annotations</artifactId>
@@ -190,19 +193,12 @@
<plugins>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.4</version>
+ <version>2.8</version>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
- <version>2.1</version>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.4.3</version>
+ <version>2.3</version>
</plugin>
</plugins>
</reporting>
@@ -215,7 +211,7 @@
<plugin>
<groupId>net.sourceforge.maven-taglib</groupId>
<artifactId>maven-taglib-plugin</artifactId>
- <version>2.3.1</version>
+ <version>2.4</version>
<configuration>
<taglib.src.dir>${symbol_dollar}{basedir}/target/classes/META-INF</taglib.src.dir>
<tldDocDir>${symbol_dollar}{basedir}/target/site/tlddoc</tldDocDir>
@@ -235,9 +231,8 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.4</version>
+ <version>2.8</version>
<executions>
<execution>
<id>attach-javadoc</id>
@@ -248,7 +243,7 @@
<plugin>
<groupId>net.sourceforge.maven-taglib</groupId>
<artifactId>maven-taglib-plugin</artifactId>
- <version>2.3.1</version>
+ <version>2.4</version>
<configuration>
<taglib.src.dir>${symbol_dollar}{basedir}/target/classes/META-INF</taglib.src.dir>
<tldDocDir>${symbol_dollar}{basedir}/target/site/tlddoc</tldDocDir>
Modified: myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-jsfcomponents20/src/main/resources/archetype-resources/examples/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-jsfcomponents20/src/main/resources/archetype-resources/examples/pom.xml?rev=1299062&r1=1299061&r2=1299062&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-jsfcomponents20/src/main/resources/archetype-resources/examples/pom.xml (original)
+++ myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-jsfcomponents20/src/main/resources/archetype-resources/examples/pom.xml Fri Mar 9 21:36:28 2012
@@ -2,23 +2,24 @@
#set( $symbol_dollar = '$' )
#set( $symbol_escape = '\' )
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. 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. See the License for the
- specific language governing permissions and limitations
- under the License.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. 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. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
-->
<!-- This is the project descriptor for the examples of my components -->
@@ -32,171 +33,281 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>${artifactId}-examples</artifactId>
<packaging>war</packaging>
- <name>My Components Examples</name>
+ <name>${artifactId}-examples</name>
+ <description>My Components Examples</description>
- <properties>
- <log4j.version>1.2.13</log4j.version>
- </properties>
-
+ <!-- Instructions
+ - Run using jetty
+ mvn clean jetty:run
+ mvn clean -Dcontainer=jetty-mojarra jetty:run
+ Set your browser to http://localhost:8080/${artifactId}-examples
+ - Build war and bundle JSF jars
+ mvn clean -Pbundle-myfaces install
+ mvn clean -Pbundle-mojarra install
+ -->
+
+ <build>
+ <finalName>myfaces-jsfcomponents20</finalName>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ </build>
+
+ <!-- Project dependencies -->
<dependencies>
- <dependency>
- <groupId>${groupId}</groupId>
- <artifactId>${artifactId}-core</artifactId>
- <version>${symbol_dollar}{project.version}</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
- <version>1.2</version>
- <scope>runtime</scope>
- </dependency>
-
- </dependencies>
+ <dependency>
+ <groupId>${groupId}</groupId>
+ <artifactId>${artifactId}-core</artifactId>
+ <version>${symbol_dollar}{project.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jsp_2.1_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-el_2.2_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.0_spec</artifactId>
+ <version>1.1.1</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- JSF API: Add here as provided dependency and then add it
+ on jetty-maven-plugin as compile/runtime dependency.
+ The same goes for other JSF libraries. -->
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <version>${symbol_dollar}{jsf-myfaces.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1.1</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ <version>1.2</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ </dependencies>
<profiles>
- <!-- By default the war examples use myfaces! :) -->
<profile>
- <id>myfaces</id>
+ <id>bundle-myfaces</id>
<activation>
<property>
- <name>!jsf</name>
+ <name>jsf</name>
+ <value>myfaces</value>
</property>
</activation>
+ <!-- Include MyFaces jars into the war -->
<dependencies>
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
<version>${symbol_dollar}{jsf-myfaces.version}</version>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-impl</artifactId>
<version>${symbol_dollar}{jsf-myfaces.version}</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
- other JSF implementations. -->
<scope>runtime</scope>
</dependency>
</dependencies>
-
+ </profile>
+ <!-- By default the war examples use myfaces! :) -->
+ <profile>
+ <!-- Plugin embedded jetty 8 container.
+ Just running use:
+ mvn clean jetty:run
+ -->
+ <!-- For debugging use (attach debugger port 8000):
+ mvnDebug clean jetty:run
+ -->
+ <id>jettyConfig</id>
+ <activation>
+ <property>
+ <name>!container</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <!--This plugin allows to run the war using mvn jetty:run -->
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-maven-plugin</artifactId>
+ <version>${symbol_dollar}{jetty.maven.plugin.version}</version>
+ <configuration>
+ <systemProperties>
+ <systemProperty>
+ <!-- optional to use the ecj compiler -->
+ <name>org.apache.jasper.compiler.disablejsr199</name>
+ <value>true</value>
+ </systemProperty>
+ </systemProperties>
+ <webApp>
+ <contextPath>/${symbol_dollar}{artifactId}</contextPath>
+ </webApp>
+ <scanIntervalSeconds>5</scanIntervalSeconds>
+ </configuration>
+ <dependencies>
+ <!-- Tld scanning only works when JSF is included
+ as container dependency. Add other jsf libraries
+ here, so jetty:run goal can find and process them -->
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <version>${symbol_dollar}{jsf-myfaces.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-impl</artifactId>
+ <version>${symbol_dollar}{jsf-myfaces.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.examples.jsfcomponents20</groupId>
+ <artifactId>myfaces-jsfcomponents20-core</artifactId>
+ <version>${symbol_dollar}{project.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
<properties>
<jsf_implementation>MyFaces</jsf_implementation>
</properties>
</profile>
- <!-- To use the examples using the Sun's JSF Reference Implementation: -Djsf=ri -->
<profile>
- <id>jsfri</id>
+ <id>bundle-mojarra</id>
<activation>
<property>
<name>jsf</name>
- <value>ri</value>
+ <value>mojarra</value>
</property>
</activation>
+ <!-- Include Mojarra jars into the war -->
<dependencies>
<dependency>
- <groupId>javax.faces</groupId>
+ <groupId>com.sun.faces</groupId>
<artifactId>jsf-api</artifactId>
- <version>${symbol_dollar}{jsf-ri.version}</version>
+ <version>${symbol_dollar}{jsf-mojarra.version}</version>
+ <scope>compile</scope>
</dependency>
<dependency>
- <groupId>javax.faces</groupId>
+ <groupId>com.sun.faces</groupId>
<artifactId>jsf-impl</artifactId>
- <version>${symbol_dollar}{jsf-ri.version}</version>
+ <version>${symbol_dollar}{jsf-mojarra.version}</version>
<scope>runtime</scope>
</dependency>
</dependencies>
-
<repositories>
<repository>
<id>java.net</id>
- <url>http://download.java.net/maven/1</url>
- <layout>legacy</layout>
+ <url>http://download.java.net/maven/2</url>
</repository>
</repositories>
-
- <properties>
- <jsf_implementation>JSF-RI</jsf_implementation>
- </properties>
</profile>
+
<profile>
- <!-- Debug profile for myfaces and jetty.
- It allows to see debug messages using -PjettyConfig -->
- <id>jettyConfig</id>
+ <!-- Plugin embedded jetty 8 container.
+ Just running use:
+ mvn clean -Dcontainer=jetty-mojarra jetty:run
+ -->
+ <!-- For debugging use (attach debugger port 8000):
+ mvn clean -Dcontainer=jetty-mojarra jetty:run
+ -->
+ <id>jettyConfig-mojarra</id>
+ <activation>
+ <property>
+ <name>container</name>
+ <value>jetty-mojarra</value>
+ </property>
+ </activation>
<build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- <resource>
- <directory>src/main/log4j</directory>
- </resource>
- </resources>
<plugins>
<plugin>
- <!--This plugin allows to run the example using mvn jetty:run -->
+ <!--This plugin allows to run the war using mvn jetty:run -->
<groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
- <version>${symbol_dollar}{maven.jetty.plugin.version}</version>
+ <artifactId>jetty-maven-plugin</artifactId>
+ <version>${symbol_dollar}{jetty.maven.plugin.version}</version>
<configuration>
- <scanIntervalSeconds>10</scanIntervalSeconds>
<systemProperties>
<systemProperty>
- <name>org.apache.commons.logging.Log</name>
- <value>org.apache.commons.logging.impl.Log4JLogger</value>
+ <!-- optional to use the ecj compiler -->
+ <name>org.apache.jasper.compiler.disablejsr199</name>
+ <value>true</value>
</systemProperty>
</systemProperties>
+ <webApp>
+ <contextPath>/${symbol_dollar}{artifactId}</contextPath>
+ </webApp>
+ <scanIntervalSeconds>5</scanIntervalSeconds>
</configuration>
+ <dependencies>
+ <!-- Tld scanning only works when JSF is included
+ as container dependency. -->
+ <dependency>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <version>${symbol_dollar}{jsf-mojarra.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ <version>${symbol_dollar}{jsf-mojarra.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.examples.jsfcomponents20</groupId>
+ <artifactId>myfaces-jsfcomponents20-core</artifactId>
+ <version>${symbol_dollar}{project.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
</plugin>
</plugins>
</build>
- <dependencies>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>${symbol_dollar}{log4j.version}</version>
- <type>jar</type>
- </dependency>
- </dependencies>
+ <repositories>
+ <repository>
+ <id>java.net</id>
+ <url>http://download.java.net/maven/2</url>
+ </repository>
+ </repositories>
+ <properties>
+ <jsf_implementation>Mojarra</jsf_implementation>
+ </properties>
</profile>
</profiles>
- <build>
- <finalName>${artifactId}</finalName>
- <plugins>
- <plugin>
- <!--This plugin allows to run the example using mvn jetty:run -->
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
- <version>${symbol_dollar}{maven.jetty.plugin.version}</version>
- <configuration>
- <scanIntervalSeconds>10</scanIntervalSeconds>
- </configuration>
- </plugin>
- </plugins>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
- </build>
</project>
Modified: myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-jsfcomponents20/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-jsfcomponents20/src/main/resources/archetype-resources/pom.xml?rev=1299062&r1=1299061&r2=1299062&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-jsfcomponents20/src/main/resources/archetype-resources/pom.xml (original)
+++ myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-jsfcomponents20/src/main/resources/archetype-resources/pom.xml Fri Mar 9 21:36:28 2012
@@ -27,17 +27,14 @@
<groupId>${groupId}</groupId>
<artifactId>${artifactId}-project</artifactId>
<packaging>pom</packaging>
- <name>My JSF Components Library Project</name>
+ <name>${artifactId}-project</name>
+ <description>My JSF Components Library Project</description>
<version>${version}</version>
- <description>
- This is the project for my funky components. This will build both the core and the examples
- </description>
-
<properties>
- <jsf-myfaces.version>2.0.4</jsf-myfaces.version>
- <jsf-ri.version>2.0.3-20100630</jsf-ri.version>
- <maven.jetty.plugin.version>6.1.22</maven.jetty.plugin.version>
+ <jsf-myfaces.version>2.0.12</jsf-myfaces.version>
+ <jsf-mojarra.version>2.0.9</jsf-mojarra.version>
+ <jetty.maven.plugin.version>8.1.1.v20120215</jetty.maven.plugin.version>
</properties>
<build>
@@ -55,7 +52,7 @@
<plugin>
<groupId>org.apache.myfaces.buildtools</groupId>
<artifactId>myfaces-builder-plugin</artifactId>
- <version>1.0.9</version>
+ <version>1.0.10</version>
</plugin>
</plugins>
</pluginManagement>
@@ -70,23 +67,37 @@
<dependencies>
<dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.1</version>
- <scope>provided</scope>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
+ <version>1.2</version>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- <scope>provided</scope>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jsp_2.1_spec</artifactId>
+ <version>1.0.1</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-el_2.2_spec</artifactId>
+ <version>1.0.2</version>
+ <scope>provided</scope>
</dependency>
-
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.0_spec</artifactId>
+ <version>1.1.1</version>
+ <scope>provided</scope>
+ </dependency>
+
<dependency>
<groupId>org.apache.myfaces.buildtools</groupId>
<artifactId>myfaces-builder-annotations</artifactId>
- <version>1.0.8</version>
+ <version>1.0.9</version>
<scope>provided</scope>
</dependency>
@@ -105,14 +116,14 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.8.1</version>
+ <version>4.8.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.myfaces.test</groupId>
<artifactId>myfaces-test20</artifactId>
- <version>1.0.2</version>
+ <version>1.0.4</version>
<scope>test</scope>
</dependency>
Modified: myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-trinidad20/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-trinidad20/src/main/resources/archetype-resources/pom.xml?rev=1299062&r1=1299061&r2=1299062&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-trinidad20/src/main/resources/archetype-resources/pom.xml (original)
+++ myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-trinidad20/src/main/resources/archetype-resources/pom.xml Fri Mar 9 21:36:28 2012
@@ -2,25 +2,26 @@
#set( $symbol_dollar = '$' )
#set( $symbol_escape = '\' )
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. 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. See the License for the
- specific language governing permissions and limitations
- under the License.
-
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. 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. 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">
@@ -29,16 +30,27 @@
<artifactId>${artifactId}</artifactId>
<packaging>war</packaging>
<version>${version}</version>
- <name>A custom project using myfaces 2.0 with trinidad</name>
+ <name>${artifactId}</name>
+ <description>A custom project using MyFaces 2.0 with Trinidad</description>
<url>http://www.myorganization.org</url>
+ <!-- Instructions
+ - Run using jetty
+ mvn clean jetty:run
+ mvn clean -Dcontainer=jetty-mojarra jetty:run
+ Set your browser to http://localhost:8080/${artifactId}
+ - Build war and bundle JSF jars
+ mvn clean -Pbundle-myfaces install
+ mvn clean -Pbundle-mojarra install
+ -->
+
<properties>
- <jsf-myfaces.version>2.0.5</jsf-myfaces.version>
- <jsf-mojarra.version>2.0.5-b02</jsf-mojarra.version>
+ <jsf-myfaces.version>2.0.12</jsf-myfaces.version>
+ <jsf-mojarra.version>2.0.9</jsf-mojarra.version>
+ <jetty.maven.plugin.version>8.1.1.v20120215</jetty.maven.plugin.version>
<trinidad.version>2.0.0-beta-2</trinidad.version>
- <maven.jetty.plugin.version>6.1.22</maven.jetty.plugin.version>
</properties>
-
+
<build>
<finalName>${artifactId}</finalName>
<plugins>
@@ -46,21 +58,87 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.6</source>
+ <target>1.6</target>
</configuration>
</plugin>
- </plugins>
+ </plugins>
</build>
-
+
+ <!-- Project dependencies -->
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
+ <version>1.2</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-el_2.2_spec</artifactId>
+ <version>1.0.2</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.0_spec</artifactId>
+ <version>1.1.1</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- JSF API: Add here as provided dependency and then add it
+ on jetty-maven-plugin as compile/runtime dependency.
+ The same goes for other JSF libraries. -->
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <version>${symbol_dollar}{jsf-myfaces.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ <version>1.2</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <!-- Apache Trinidad -->
+ <dependency>
+ <groupId>org.apache.myfaces.trinidad</groupId>
+ <artifactId>trinidad-api</artifactId>
+ <version>${symbol_dollar}{trinidad.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.trinidad</groupId>
+ <artifactId>trinidad-impl</artifactId>
+ <version>${symbol_dollar}{trinidad.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.8.2</version>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+
<profiles>
<profile>
- <id>myfaces</id>
+ <id>bundle-myfaces</id>
<activation>
<property>
- <name>!jsf</name>
+ <name>jsf</name>
+ <value>myfaces</value>
</property>
</activation>
+ <!-- Include MyFaces jars into the war -->
<dependencies>
<dependency>
<groupId>org.apache.myfaces.core</groupId>
@@ -76,15 +154,85 @@
</dependency>
</dependencies>
</profile>
+
+ <profile>
+ <!-- Plugin embedded jetty 8 container.
+ Just running use:
+ mvn clean jetty:run
+ -->
+ <!-- For debugging use (attach debugger port 8000):
+ mvnDebug clean jetty:run
+ -->
+ <id>jettyConfig</id>
+ <activation>
+ <property>
+ <name>!container</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <!--This plugin allows to run the war using mvn jetty:run -->
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-maven-plugin</artifactId>
+ <version>${symbol_dollar}{jetty.maven.plugin.version}</version>
+ <configuration>
+ <systemProperties>
+ <systemProperty>
+ <!-- optional to use the ecj compiler -->
+ <name>org.apache.jasper.compiler.disablejsr199</name>
+ <value>true</value>
+ </systemProperty>
+ </systemProperties>
+ <webApp>
+ <contextPath>/${artifactId}</contextPath>
+ </webApp>
+ <scanIntervalSeconds>5</scanIntervalSeconds>
+ </configuration>
+ <dependencies>
+ <!-- Tld scanning only works when JSF is included
+ as container dependency. Add other jsf libraries
+ here, so jetty:run goal can find and process them -->
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <version>${symbol_dollar}{jsf-myfaces.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-impl</artifactId>
+ <version>${symbol_dollar}{jsf-myfaces.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <!-- Apache Trinidad -->
+ <dependency>
+ <groupId>org.apache.myfaces.trinidad</groupId>
+ <artifactId>trinidad-api</artifactId>
+ <version>${symbol_dollar}{trinidad.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.trinidad</groupId>
+ <artifactId>trinidad-impl</artifactId>
+ <version>${symbol_dollar}{trinidad.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
<profile>
- <!-- Active adding -Djsf=mojarra when execute maven goals. -->
- <id>jsf-ri</id>
+ <id>bundle-mojarra</id>
<activation>
<property>
<name>jsf</name>
<value>mojarra</value>
</property>
</activation>
+ <!-- Include Mojarra jars into the war -->
<dependencies>
<dependency>
<groupId>com.sun.faces</groupId>
@@ -102,63 +250,86 @@
<repositories>
<repository>
<id>java.net</id>
- <url>http://download.java.net/maven/1</url>
- <layout>legacy</layout>
+ <url>http://download.java.net/maven/2</url>
</repository>
</repositories>
</profile>
-
+
<profile>
- <!-- Use mvn clean jetty:run-exploded -PjettyConfig to run with jetty -->
- <id>jettyConfig</id>
+ <!-- Plugin embedded jetty 8 container.
+ Just running use:
+ mvn clean -Dcontainer=jetty-mojarra jetty:run
+ -->
+ <!-- For debugging use (attach debugger port 8000):
+ mvn clean -Dcontainer=jetty-mojarra jetty:run
+ -->
+ <id>jettyConfig-mojarra</id>
+ <activation>
+ <property>
+ <name>container</name>
+ <value>jetty-mojarra</value>
+ </property>
+ </activation>
<build>
<plugins>
<plugin>
<!--This plugin allows to run the war using mvn jetty:run -->
<groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
- <version>${symbol_dollar}{maven.jetty.plugin.version}</version>
+ <artifactId>jetty-maven-plugin</artifactId>
+ <version>${symbol_dollar}{jetty.maven.plugin.version}</version>
<configuration>
- <scanIntervalSeconds>10</scanIntervalSeconds>
+ <systemProperties>
+ <systemProperty>
+ <!-- optional to use the ecj compiler -->
+ <name>org.apache.jasper.compiler.disablejsr199</name>
+ <value>true</value>
+ </systemProperty>
+ </systemProperties>
+ <webApp>
+ <contextPath>/${artifactId}</contextPath>
+ </webApp>
+ <scanIntervalSeconds>5</scanIntervalSeconds>
</configuration>
+ <dependencies>
+ <!-- Tld scanning only works when JSF is included
+ as container dependency. Add other jsf libraries
+ here, so jetty:run goal can find and process them -->
+ <dependency>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <version>${symbol_dollar}{jsf-mojarra.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ <version>${symbol_dollar}{jsf-mojarra.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <!-- Apache Trinidad -->
+ <dependency>
+ <groupId>org.apache.myfaces.trinidad</groupId>
+ <artifactId>trinidad-api</artifactId>
+ <version>${symbol_dollar}{trinidad.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.trinidad</groupId>
+ <artifactId>trinidad-impl</artifactId>
+ <version>${symbol_dollar}{trinidad.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
</plugin>
</plugins>
</build>
+ <repositories>
+ <repository>
+ <id>java.net</id>
+ <url>http://download.java.net/maven/2</url>
+ </repository>
+ </repositories>
</profile>
</profiles>
- <!-- Project dependencies -->
- <dependencies>
-
- <!-- Apache Trinidad -->
- <dependency>
- <groupId>org.apache.myfaces.trinidad</groupId>
- <artifactId>trinidad-api</artifactId>
- <version>${symbol_dollar}{trinidad.version}</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.myfaces.trinidad</groupId>
- <artifactId>trinidad-impl</artifactId>
- <version>${symbol_dollar}{trinidad.version}</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
- <version>1.2</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.1</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
</project>
Modified: myfaces/myfaces-build-tools/trunk/maven2-archetypes/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-archetypes/pom.xml?rev=1299062&r1=1299061&r2=1299062&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-archetypes/pom.xml (original)
+++ myfaces/myfaces-build-tools/trunk/maven2-archetypes/pom.xml Fri Mar 9 21:36:28 2012
@@ -34,7 +34,7 @@
<parent>
<groupId>org.apache.myfaces</groupId>
<artifactId>myfaces</artifactId>
- <version>10</version>
+ <version>13</version>
</parent>
<groupId>org.apache.myfaces.buildtools</groupId>
@@ -112,6 +112,7 @@
<modules>
<module>myfaces-archetype-helloworld</module>
<module>myfaces-archetype-helloworld20</module>
+ <module>myfaces-archetype-helloworld20-debug</module>
<module>myfaces-archetype-helloworld20-owb</module>
<module>myfaces-archetype-helloworld-facelets</module>
<module>myfaces-archetype-helloworld-portlets</module>