You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2013/11/05 09:28:34 UTC
svn commit: r1538904 - in /myfaces/tobago/trunk: pom.xml
src/site/apt/getting-started.apt tobago-example/pom.xml
tobago-example/tobago-example-addressbook-cdi/pom.xml
tobago-example/tobago-example-demo/pom.xml
Author: lofwyr
Date: Tue Nov 5 08:28:34 2013
New Revision: 1538904
URL: http://svn.apache.org/r1538904
Log:
updating MyFaces to 2.0.19 and 2.1.13
Adding Profile for MyFaces 2.2 (beta)
Modified:
myfaces/tobago/trunk/pom.xml
myfaces/tobago/trunk/src/site/apt/getting-started.apt
myfaces/tobago/trunk/tobago-example/pom.xml
myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/pom.xml
myfaces/tobago/trunk/tobago-example/tobago-example-demo/pom.xml
Modified: myfaces/tobago/trunk/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/pom.xml?rev=1538904&r1=1538903&r2=1538904&view=diff
==============================================================================
--- myfaces/tobago/trunk/pom.xml (original)
+++ myfaces/tobago/trunk/pom.xml Tue Nov 5 08:28:34 2013
@@ -1589,6 +1589,49 @@
</profile>
<profile>
+ <id>jsf-2.2</id>
+ <activation>
+ <property>
+ <name>jsf</name>
+ <value>myfaces-2.2</value>
+ </property>
+ </activation>
+ <properties>
+ <jsf.target>2.0</jsf.target>
+ </properties>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <version>${myfaces22.version}</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-impl</artifactId>
+ <version>${myfaces22.version}</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.1</version>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <optional>true</optional>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+ </profile>
+
+ <profile>
<id>mojarra-2.0</id>
<activation>
<property>
@@ -1747,8 +1790,9 @@
<properties>
<myfaces-test20.version>1.0.4</myfaces-test20.version>
- <myfaces20.version>2.0.18</myfaces20.version>
- <myfaces21.version>2.1.12</myfaces21.version>
+ <myfaces20.version>2.0.19</myfaces20.version>
+ <myfaces21.version>2.1.13</myfaces21.version>
+ <myfaces22.version>2.2.0-beta</myfaces22.version>
<mojarra20.version>2.0.11</mojarra20.version>
<mojarra21.version>2.1.7</mojarra21.version>
<mojarra22.version>2.2.2</mojarra22.version>
Modified: myfaces/tobago/trunk/src/site/apt/getting-started.apt
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/src/site/apt/getting-started.apt?rev=1538904&r1=1538903&r2=1538904&view=diff
==============================================================================
--- myfaces/tobago/trunk/src/site/apt/getting-started.apt (original)
+++ myfaces/tobago/trunk/src/site/apt/getting-started.apt Tue Nov 5 08:28:34 2013
@@ -89,7 +89,7 @@ The Demo
and deploy the WAR from the target directory manually.
-Using different JSF implementations
+Using different JSF implementations (Tobago 1.x)
By default the example will be started with MyFaces 1.2.
You can run the examples with other version like you see here:
@@ -103,3 +103,17 @@ Using different JSF implementations
mvn jetty:run -Djsf=mojarra-2.1
mvn jetty:run -Djsf=mojarra-2.2
+----------------------------------------
+
+Using different JSF implementations (Tobago 2.x)
+
+ By default the example will be started with MyFaces 2.0
+ You can run the examples with other version like you see here:
+
++----------------------------------------
+ mvn jetty:run
+ mvn jetty:run -Djsf=myfaces-2.1
+ mvn jetty:run -Djsf=myfaces-2.2
+ mvn jetty:run -Djsf=mojarra-2.0
+ mvn jetty:run -Djsf=mojarra-2.1
+ mvn jetty:run -Djsf=mojarra-2.2
++----------------------------------------
Modified: myfaces/tobago/trunk/tobago-example/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/pom.xml?rev=1538904&r1=1538903&r2=1538904&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-example/pom.xml Tue Nov 5 08:28:34 2013
@@ -249,6 +249,35 @@
</profile>
<profile>
+ <id>myfaces-2.2</id>
+ <activation>
+ <property>
+ <name>jsf</name>
+ <value>myfaces-2.2</value>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <version>${myfaces22.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-impl</artifactId>
+ <version>${myfaces22.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+
+ <profile>
<id>mojarra-2.0</id>
<activation>
<property>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/pom.xml?rev=1538904&r1=1538903&r2=1538904&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/pom.xml Tue Nov 5 08:28:34 2013
@@ -526,6 +526,53 @@
</profile>
<profile>
+ <id>myfaces-2.2</id>
+ <activation>
+ <property>
+ <name>jsf</name>
+ <value>myfaces-2.2</value>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-jsf</artifactId>
+ <version>${openwebbeans.version}</version>
+ </dependency>
+
+<!--
+ <dependency>
+ <groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
+ <artifactId>myfaces-extcdi-jsf20-module-api</artifactId>
+ <version>${myfaces-extcdi.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
+ <artifactId>myfaces-extcdi-jsf20-module-impl</artifactId>
+ <version>${myfaces-extcdi.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+-->
+<!-- for JSF 2.0 and Bean Validation (JSR-303) -->
+ <dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ <version>2.2</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.glassfish.web</groupId>
+ <artifactId>el-impl</artifactId>
+ <version>2.2</version>
+ </dependency>
+
+ </dependencies>
+ </profile>
+
+ <profile>
<id>mojarra-2.0</id>
<activation>
<property>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/pom.xml?rev=1538904&r1=1538903&r2=1538904&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/pom.xml Tue Nov 5 08:28:34 2013
@@ -412,6 +412,80 @@
</profile>
<profile>
+ <id>myfaces-2.2</id>
+ <activation>
+ <property>
+ <name>jsf</name>
+ <value>myfaces-2.2</value>
+ </property>
+ </activation>
+ <dependencies>
+
+ <!-- Specs -->
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jcdi_1.0_spec</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-validation_1.0_spec</artifactId>
+ <version>1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-atinject_1.0_spec</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-interceptor_1.1_spec</artifactId>
+ <version>1.0</version>
+ </dependency>
+
+ <!-- OWB -->
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-jsf</artifactId>
+ <version>${openwebbeans.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-web</artifactId>
+ <version>${openwebbeans.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-resource</artifactId>
+ <version>${openwebbeans.version}</version>
+ </dependency>
+
+ <!-- Codi for JavaEE5 -->
+ <dependency>
+ <groupId>org.apache.myfaces.extensions.cdi.modules.jee5-support</groupId>
+ <artifactId>myfaces-extcdi-jee5-openwebbeans-support</artifactId>
+ <version>${myfaces-extcdi.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <!-- for JSF 2.0 and Bean Validation (JSR-303) -->
+ <dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ <version>2.2</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.glassfish.web</groupId>
+ <artifactId>el-impl</artifactId>
+ <version>2.2</version>
+ </dependency>
+
+ </dependencies>
+ </profile>
+
+ <profile>
<id>mojarra-2.0</id>
<activation>
<property>