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/02/12 16:02:57 UTC
svn commit: r1445194 - in /myfaces/tobago/trunk: ./ tobago-core/
tobago-core/src/main/java/org/apache/myfaces/tobago/context/
tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/
tobago-example/ tobago-example/tobago-example-demo/
Author: lofwyr
Date: Tue Feb 12 15:02:57 2013
New Revision: 1445194
URL: http://svn.apache.org/r1445194
Log:
TOBAGO-1228: Setting JSF 2.0 as default dependency for Tobago
Modified:
myfaces/tobago/trunk/pom.xml
myfaces/tobago/trunk/tobago-core/pom.xml
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoFacesContext.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIMessages.java
myfaces/tobago/trunk/tobago-example/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=1445194&r1=1445193&r2=1445194&view=diff
==============================================================================
--- myfaces/tobago/trunk/pom.xml (original)
+++ myfaces/tobago/trunk/pom.xml Tue Feb 12 15:02:57 2013
@@ -393,13 +393,13 @@
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
- <version>${myfaces12.version}</version>
+ <version>${myfaces20.version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-impl</artifactId>
- <version>${myfaces12.version}</version>
+ <version>${myfaces20.version}</version>
<optional>true</optional>
</dependency>
<dependency>
@@ -539,6 +539,18 @@
<version>1.4.2</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.test</groupId>
+ <artifactId>myfaces-test12</artifactId>
+ <version>${myfaces-test12.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.test</groupId>
+ <artifactId>myfaces-test20</artifactId>
+ <version>${myfaces-test20.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</dependencyManagement>
@@ -1454,6 +1466,50 @@
-->
<profile>
+ <id>jsf-1.2</id>
+ <activation>
+ <property>
+ <name>jsf</name>
+ <value>myfaces-1.2</value>
+ </property>
+ </activation>
+ <properties>
+ <jsf.target>1.2</jsf.target>
+ </properties>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <version>${myfaces12.version}</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-impl</artifactId>
+ <version>${myfaces12.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>jsf-2.0</id>
<activation>
<property>
@@ -1495,6 +1551,7 @@
</dependencies>
</dependencyManagement>
</profile>
+-->
<profile>
<id>jsf-2.1</id>
@@ -1742,6 +1799,7 @@
<properties>
<myfaces12.version>1.2.12</myfaces12.version>
<myfaces-test12.version>1.0.4</myfaces-test12.version>
+ <myfaces-test20.version>1.0.4</myfaces-test20.version>
<myfaces20.version>2.0.16</myfaces20.version>
<myfaces21.version>2.1.10</myfaces21.version>
<mojarra12.version>1.2_15</mojarra12.version>
@@ -1766,6 +1824,6 @@
<maven.compile.target>1.5</maven.compile.target>
<maven.compile.encoding>UTF-8</maven.compile.encoding>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <jsf.target>1.2</jsf.target>
+ <jsf.target>2.0</jsf.target>
</properties>
</project>
Modified: myfaces/tobago/trunk/tobago-core/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/pom.xml?rev=1445194&r1=1445193&r2=1445194&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-core/pom.xml Tue Feb 12 15:02:57 2013
@@ -257,11 +257,10 @@
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
+ <!-- TBD: if we support JSF 1.2 this must be configurable over a profile -->
<dependency>
<groupId>org.apache.myfaces.test</groupId>
- <artifactId>myfaces-test12</artifactId>
- <version>${myfaces-test12.version}</version>
- <scope>test</scope>
+ <artifactId>myfaces-test20</artifactId>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoFacesContext.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoFacesContext.java?rev=1445194&r1=1445193&r2=1445194&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoFacesContext.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoFacesContext.java Tue Feb 12 15:02:57 2013
@@ -22,17 +22,20 @@ package org.apache.myfaces.tobago.contex
import org.apache.commons.collections.list.SetUniqueList;
import org.apache.commons.collections.set.ListOrderedSet;
import org.apache.myfaces.tobago.internal.component.AbstractUIPopup;
+import org.apache.myfaces.tobago.util.FacesVersion;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.faces.context.FacesContext;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
import java.util.Set;
public class TobagoFacesContext extends FacesContextWrapper {
+ private static final Logger LOG = LoggerFactory.getLogger(TobagoFacesContext.class);
+
private SetUniqueList scriptFiles;
private Set<String> scriptBlocks;
@@ -57,7 +60,7 @@ public class TobagoFacesContext extends
private boolean ajax;
- private Map<Object, Object> attributes;
+// private Map<Object, Object> attributes;
public TobagoFacesContext(FacesContext context) {
super(context);
@@ -72,12 +75,21 @@ public class TobagoFacesContext extends
popups = new ListOrderedSet();
}
+/* TBD: if we support JSF 1.2 whe have to do something here.*/
+ static {
+ if (!FacesVersion.supports20()) {
+ LOG.error("JSF 1.2 is currently not supported.");
+ }
+ }
+
+/* TBD: if we support JSF 1.2 whe have to do something here.
public final Map<Object, Object> getAttributes() {
if (attributes == null) {
attributes = new HashMap<Object, Object>();
}
return attributes;
}
+*/
public boolean isAjax() {
return ajax;
@@ -157,9 +169,11 @@ public class TobagoFacesContext extends
@Override
public void release() {
super.release();
+/*
if (attributes != null) {
attributes.clear();
}
+*/
clearScriptsAndPopups();
}
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIMessages.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIMessages.java?rev=1445194&r1=1445193&r2=1445194&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIMessages.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIMessages.java Tue Feb 12 15:02:57 2013
@@ -117,7 +117,9 @@ public abstract class AbstractUIMessages
public abstract OrderBy getOrderBy();
+/* TBD: if we support JSF 1.2 whe have to do something here.
public abstract String getFor();
+*/
public static enum OrderBy {
Modified: myfaces/tobago/trunk/tobago-example/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/pom.xml?rev=1445194&r1=1445193&r2=1445194&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-example/pom.xml Tue Feb 12 15:02:57 2013
@@ -268,7 +268,8 @@
<id>myfaces-1.2</id>
<activation>
<property>
- <name>!jsf</name>
+ <name>jsf</name>
+ <value>myfaces-1.2</value>
</property>
</activation>
<dependencies>
@@ -296,8 +297,7 @@
<id>myfaces-2.0</id>
<activation>
<property>
- <name>jsf</name>
- <value>myfaces-2.0</value>
+ <name>!jsf</name>
</property>
</activation>
<dependencies>
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=1445194&r1=1445193&r2=1445194&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/pom.xml Tue Feb 12 15:02:57 2013
@@ -318,7 +318,8 @@
<id>myfaces-1.2</id>
<activation>
<property>
- <name>!jsf</name>
+ <name>jsf</name>
+ <value>myfaces-1.2</value>
</property>
</activation>
<dependencies>
@@ -350,8 +351,7 @@
<id>myfaces-2.0</id>
<activation>
<property>
- <name>jsf</name>
- <value>myfaces-2.0</value>
+ <name>!jsf</name>
</property>
</activation>
<dependencies>