Author: lofwyr
Date: Mon May 7 16:18:08 2012
New Revision: 1335095
URL: http://svn.apache.org/viewvc?rev=1335095&view=rev
Log:
TOBAGO-1123: Updating dependencies of Mojarra library versions
- using Mojarra in the demo
Modified:
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/BundleMapWrapper.java
myfaces/tobago/trunk/tobago-example/tobago-example-demo/pom.xml
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/BundleMapWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/BundleMapWrapper.java?rev=1335095&r1=1335094&r2=1335095&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/BundleMapWrapper.java
(original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/BundleMapWrapper.java
Mon May 7 16:18:08 2012
@@ -20,15 +20,12 @@ package org.apache.myfaces.tobago.util;
import org.apache.myfaces.tobago.context.ResourceManagerUtils;
import javax.faces.context.FacesContext;
+import java.io.Serializable;
+import java.util.Collection;
import java.util.Map;
import java.util.Set;
-import java.util.Collection;
-/*
- * Date: 20.04.2006
- * Time: 19:31:21
- */
-public class BundleMapWrapper implements Map {
+public class BundleMapWrapper implements Map, Serializable {
private String basename;
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=1335095&r1=1335094&r2=1335095&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/pom.xml Mon May 7 16:18:08 2012
@@ -436,6 +436,129 @@
</profile>
<profile>
+ <id>mojarra-1.2</id>
+ <activation>
+ <property>
+ <name>jsf</name>
+ <value>mojarra-1.2</value>
+ </property>
+ </activation>
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-jsf12</artifactId>
+ <version>${openwebbeans.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
+ <artifactId>myfaces-extcdi-jsf12-module-api</artifactId>
+ <version>${myfaces-extcdi.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
+ <artifactId>myfaces-extcdi-jsf12-module-impl</artifactId>
+ <version>${myfaces-extcdi.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ </dependencies>
+ </profile>
+
+ <profile>
+ <id>mojarra-2.0</id>
+ <activation>
+ <property>
+ <name>jsf</name>
+ <value>mojarra-2.0</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.1</id>
+ <activation>
+ <property>
+ <name>jsf</name>
+ <value>mojarra-2.1</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>
<!--
mvn package cargo:start -Ptomcat6x
-->
|