You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by bo...@apache.org on 2010/09/28 19:25:48 UTC
svn commit: r1002278 - in /myfaces/tobago/trunk: ./ tobago-assembly/
tobago-core/ tobago-extension/ tobago-extension/tobago-facelets/
tobago-extension/tobago-sandbox/ tobago-jsf-compat/
tobago-jsf-compat/src/main/java-jsf-1.1/org/apache/myfaces/tobago/...
Author: bommel
Date: Tue Sep 28 17:25:46 2010
New Revision: 1002278
URL: http://svn.apache.org/viewvc?rev=1002278&view=rev
Log:
refactored compat module
cleaned up dependencies
Added:
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.2/org/apache/myfaces/tobago/util/MessageUtils.java.bak (contents, props changed)
- copied, changed from r1001002, myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.2/org/apache/myfaces/tobago/util/MessageUtils.java
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/application/LabelValueExpressionFacesMessage.java (contents, props changed)
- copied, changed from r1001002, myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.2/org/apache/myfaces/tobago/application/LabelValueExpressionFacesMessage.java
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/compat/FacesUtils.java (contents, props changed)
- copied, changed from r1001002, myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.1/org/apache/myfaces/tobago/compat/FacesUtils.java
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/compat/FacesUtilsEL.java (with props)
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/component/MethodBindingToMethodExpression.java (contents, props changed)
- copied, changed from r1001002, myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.2/org/apache/myfaces/tobago/component/MethodBindingToMethodExpression.java
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/component/MethodExpressionToMethodBinding.java (contents, props changed)
- copied, changed from r1001002, myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.2/org/apache/myfaces/tobago/component/MethodExpressionToMethodBinding.java
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/MethodExpressionStateChangeListener.java (contents, props changed)
- copied, changed from r1001002, myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.2/org/apache/myfaces/tobago/event/MethodExpressionStateChangeListener.java
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/MethodExpressionTabChangeListener.java (contents, props changed)
- copied, changed from r1001002, myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.2/org/apache/myfaces/tobago/event/MethodExpressionTabChangeListener.java
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/MethodExpressionTreeExpansionListener.java (contents, props changed)
- copied, changed from r1001002, myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.2/org/apache/myfaces/tobago/event/MethodExpressionTreeExpansionListener.java
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/ValueExpressionPopupActionListener.java (contents, props changed)
- copied, changed from r1001002, myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.2/org/apache/myfaces/tobago/event/ValueExpressionPopupActionListener.java
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/ValueExpressionTabChangeListener.java (contents, props changed)
- copied, changed from r1001002, myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.2/org/apache/myfaces/tobago/event/ValueExpressionTabChangeListener.java
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/internal/
- copied from r1001002, myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.2/org/apache/myfaces/tobago/internal/
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/util/MessageUtils.java (contents, props changed)
- copied, changed from r1001002, myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.1/org/apache/myfaces/tobago/util/MessageUtils.java
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/util/ValueExpressionComparator.java (contents, props changed)
- copied, changed from r1001002, myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.2/org/apache/myfaces/tobago/util/ValueExpressionComparator.java
Removed:
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.1/org/apache/myfaces/tobago/compat/FacesUtils.java
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.1/org/apache/myfaces/tobago/util/MessageUtils.java
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.2/org/apache/myfaces/tobago/application/LabelValueExpressionFacesMessage.java
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.2/org/apache/myfaces/tobago/compat/FacesUtils.java
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.2/org/apache/myfaces/tobago/component/MethodBindingToMethodExpression.java
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.2/org/apache/myfaces/tobago/component/MethodExpressionToMethodBinding.java
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.2/org/apache/myfaces/tobago/event/MethodExpressionStateChangeListener.java
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.2/org/apache/myfaces/tobago/event/MethodExpressionTabChangeListener.java
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.2/org/apache/myfaces/tobago/event/MethodExpressionTreeExpansionListener.java
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.2/org/apache/myfaces/tobago/event/ValueExpressionPopupActionListener.java
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.2/org/apache/myfaces/tobago/event/ValueExpressionTabChangeListener.java
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.2/org/apache/myfaces/tobago/internal/
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.2/org/apache/myfaces/tobago/util/MessageUtils.java
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.2/org/apache/myfaces/tobago/util/ValueExpressionComparator.java
Modified:
myfaces/tobago/trunk/pom.xml
myfaces/tobago/trunk/tobago-assembly/pom.xml
myfaces/tobago/trunk/tobago-core/pom.xml
myfaces/tobago/trunk/tobago-extension/pom.xml
myfaces/tobago/trunk/tobago-extension/tobago-facelets/pom.xml
myfaces/tobago/trunk/tobago-extension/tobago-sandbox/pom.xml
myfaces/tobago/trunk/tobago-jsf-compat/pom.xml
myfaces/tobago/trunk/tobago-theme/pom.xml
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/pom.xml
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/pom.xml
myfaces/tobago/trunk/tobago-tool/tobago-tool-annotation/pom.xml
Modified: myfaces/tobago/trunk/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/pom.xml?rev=1002278&r1=1002277&r2=1002278&view=diff
==============================================================================
--- myfaces/tobago/trunk/pom.xml (original)
+++ myfaces/tobago/trunk/pom.xml Tue Sep 28 17:25:46 2010
@@ -385,12 +385,14 @@
<artifactId>jsp-api</artifactId>
<version>2.1</version>
<optional>true</optional>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.5</version>
<optional>true</optional>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -407,11 +409,11 @@
<artifactId>jcl-over-slf4j</artifactId>
<version>${slf4j.version}</version>
</dependency>
- <!--dependency>
+ <dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>${logback.version}</version>
- </dependency-->
+ </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
@@ -441,6 +443,7 @@
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>${commons-logging.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-digester</groupId>
@@ -513,6 +516,23 @@
<artifactId>junit</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
<scm>
@@ -539,6 +559,7 @@
<goals>
<goal>add-source</goal>
</goals>
+ <phase>process-resources</phase>
<configuration>
<sources>
<source>src/main/java-jsf-${jsf.targetDirectory}</source>
@@ -891,6 +912,7 @@
<tagBase>https://svn.apache.org/repos/asf/myfaces/tobago/tags</tagBase>
<preparationGoals>clean install</preparationGoals>
<remoteTagging>true</remoteTagging>
+ <autoVersionSubmodules>true</autoVersionSubmodules>
</configuration>
</plugin>
</plugins>
@@ -1401,12 +1423,14 @@
<artifactId>jsp-api</artifactId>
<version>2.0</version>
<optional>true</optional>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.4</version>
<optional>true</optional>
+ <scope>provided</scope>
</dependency>
</dependencies>
</dependencyManagement>
@@ -1449,6 +1473,7 @@
<artifactId>servlet-api</artifactId>
<version>2.5</version>
<optional>true</optional>
+ <scope>provided</scope>
</dependency>
</dependencies>
</dependencyManagement>
@@ -1485,12 +1510,14 @@
<artifactId>jsp-api</artifactId>
<version>2.0</version>
<optional>true</optional>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.4</version>
<optional>true</optional>
+ <scope>provided</scope>
</dependency>
</dependencies>
</dependencyManagement>
@@ -1539,6 +1566,7 @@
<artifactId>jsp-api</artifactId>
<version>2.1</version>
<optional>true</optional>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
@@ -1599,6 +1627,7 @@
<artifactId>servlet-api</artifactId>
<version>2.5</version>
<optional>true</optional>
+ <scope>provided</scope>
</dependency>
</dependencies>
</dependencyManagement>
Modified: myfaces/tobago/trunk/tobago-assembly/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-assembly/pom.xml?rev=1002278&r1=1002277&r2=1002278&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-assembly/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-assembly/pom.xml Tue Sep 28 17:25:46 2010
@@ -47,6 +47,18 @@
<dependencies>
<dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <optional>true</optional>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <optional>true</optional>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-theme-charlotteville</artifactId>
<version>${project.version}</version>
@@ -76,6 +88,18 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.tobago</groupId>
+ <artifactId>tobago-deprecation</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.tobago</groupId>
+ <artifactId>tobago-sandbox</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
</dependencies>
<profiles>
@@ -357,6 +381,12 @@
</artifactItem>
<artifactItem>
<groupId>${project.groupId}</groupId>
+ <artifactId>tobago-deprecation</artifactId>
+ <version>${project.version}</version>
+ <classifier>sources</classifier>
+ </artifactItem>
+ <artifactItem>
+ <groupId>${project.groupId}</groupId>
<artifactId>tobago-theme-charlotteville</artifactId>
<version>${project.version}</version>
<classifier>sources</classifier>
@@ -435,29 +465,6 @@
</plugin>
- <!--plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.3</version>
-
- <executions>
- <execution>
- <phase>process-resources</phase>
- <id>rename-files</id>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <move failonerror="false" file="${project.build.directory}/assembly/out/tobago-${project.version}-source-release.zip" toFile="${project.build.directory}/assembly/out/myfaces-tobago-${project.version}-source-release.zip" />
-
- </tasks>
- </configuration>
- </execution>
- </executions>
-
- </plugin-->
-
</plugins>
</build>
</profile>
Modified: myfaces/tobago/trunk/tobago-core/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/pom.xml?rev=1002278&r1=1002277&r2=1002278&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-core/pom.xml Tue Sep 28 17:25:46 2010
@@ -36,7 +36,7 @@
<executions>
<execution>
<id>add-source</id>
- <phase>generate-sources</phase>
+ <phase>process-resources</phase>
<goals>
<goal>add-source</goal>
</goals>
@@ -264,16 +264,11 @@
</reporting>
<dependencies>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- <!-- XXX needed for retro-->
- <!-- <scope>compile</scope> -->
- </dependency>
- <dependency>
+ <!--dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-impl</artifactId>
- </dependency>
+ <optional>true</optional>
+ </dependency-->
<dependency>
<groupId>org.apache.myfaces.tobago</groupId>
@@ -340,11 +335,6 @@
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <optional>true</optional>
- </dependency>
- <dependency>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-tool-annotation</artifactId>
<version>${project.version}</version>
Modified: myfaces/tobago/trunk/tobago-extension/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/pom.xml?rev=1002278&r1=1002277&r2=1002278&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-extension/pom.xml Tue Sep 28 17:25:46 2010
@@ -46,97 +46,4 @@
</dependency>
</dependencies>
- <profiles>
-
- <profile>
- <id>myfaces-1.1</id>
- <activation>
- <property>
- <name>jsf</name>
- <value>myfaces-1.1</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- </dependency>
- </dependencies>
- </profile>
-
- <profile>
- <id>myfaces-1.2</id>
- <dependencies>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- </dependency>
- </dependencies>
- </profile>
-
- <profile>
- <id>myfaces-2.0</id>
- <activation>
- <property>
- <name>jsf</name>
- <value>myfaces-2.0</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- </dependency>
- </dependencies>
- </profile>
-
- <profile>
- <id>mojarra-1.1</id>
- <activation>
- <property>
- <name>jsf</name>
- <value>mojarra-1.1</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- </dependency>
- </dependencies>
- </profile>
-
- <profile>
- <id>mojarra-1.2</id>
- <activation>
- <property>
- <name>jsf</name>
- <value>mojarra-1.2</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- </dependency>
- </dependencies>
- </profile>
-
- <profile>
- <id>mojarra-2.0</id>
- <activation>
- <property>
- <name>jsf</name>
- <value>mojarra-2.0</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-api</artifactId>
- </dependency>
- </dependencies>
- </profile>
-
- </profiles>
</project>
Modified: myfaces/tobago/trunk/tobago-extension/tobago-facelets/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-facelets/pom.xml?rev=1002278&r1=1002277&r2=1002278&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-facelets/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-facelets/pom.xml Tue Sep 28 17:25:46 2010
@@ -138,11 +138,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <optional>true</optional>
- </dependency>
</dependencies>
<profiles>
Modified: myfaces/tobago/trunk/tobago-extension/tobago-sandbox/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-sandbox/pom.xml?rev=1002278&r1=1002277&r2=1002278&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-sandbox/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-sandbox/pom.xml Tue Sep 28 17:25:46 2010
@@ -333,11 +333,6 @@
<artifactId>maven-taglib-plugin</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.apache.myfaces.test</groupId>
<artifactId>myfaces-test12</artifactId>
<version>${myfaces-test12.version}</version>
Modified: myfaces/tobago/trunk/tobago-jsf-compat/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-jsf-compat/pom.xml?rev=1002278&r1=1002277&r2=1002278&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-jsf-compat/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-jsf-compat/pom.xml Tue Sep 28 17:25:46 2010
@@ -47,10 +47,15 @@
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
+ <version>${myfaces12.version}</version>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
+ <version>2.1</version>
+ <optional>true</optional>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Copied: myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.2/org/apache/myfaces/tobago/util/MessageUtils.java.bak (from r1001002, myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.2/org/apache/myfaces/tobago/util/MessageUtils.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.2/org/apache/myfaces/tobago/util/MessageUtils.java.bak?p2=myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.2/org/apache/myfaces/tobago/util/MessageUtils.java.bak&p1=myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.2/org/apache/myfaces/tobago/util/MessageUtils.java&r1=1001002&r2=1002278&rev=1002278&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.2/org/apache/myfaces/tobago/util/MessageUtils.java (original)
+++ myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.2/org/apache/myfaces/tobago/util/MessageUtils.java.bak Tue Sep 28 17:25:46 2010
@@ -18,7 +18,7 @@ package org.apache.myfaces.tobago.util;
*/
import org.apache.myfaces.tobago.application.LabelValueExpressionFacesMessage;
-import org.apache.myfaces.tobago.compat.FacesUtils;
+import org.apache.myfaces.tobago.compat.FacesUtilsEL;
import javax.faces.application.FacesMessage;
import javax.faces.component.UIComponent;
@@ -120,8 +120,8 @@ public class MessageUtils {
if (label != null) {
return label.toString();
}
- if (FacesUtils.hasValueBindingOrValueExpression(component, "label")) {
- return FacesUtils.getExpressionString(component, "label");
+ if (FacesUtilsEL.hasValueBindingOrValueExpression(component, "label")) {
+ return FacesUtilsEL.getExpressionString(component, "label");
}
return component.getClientId(facesContext);
}
Propchange: myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.2/org/apache/myfaces/tobago/util/MessageUtils.java.bak
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.2/org/apache/myfaces/tobago/util/MessageUtils.java.bak
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/application/LabelValueExpressionFacesMessage.java (from r1001002, myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.2/org/apache/myfaces/tobago/application/LabelValueExpressionFacesMessage.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/application/LabelValueExpressionFacesMessage.java?p2=myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/application/LabelValueExpressionFacesMessage.java&p1=myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.2/org/apache/myfaces/tobago/application/LabelValueExpressionFacesMessage.java&r1=1001002&r2=1002278&rev=1002278&view=diff
==============================================================================
(empty)
Propchange: myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/application/LabelValueExpressionFacesMessage.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/application/LabelValueExpressionFacesMessage.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/compat/FacesUtils.java (from r1001002, myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.1/org/apache/myfaces/tobago/compat/FacesUtils.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/compat/FacesUtils.java?p2=myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/compat/FacesUtils.java&p1=myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.1/org/apache/myfaces/tobago/compat/FacesUtils.java&r1=1001002&r2=1002278&rev=1002278&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.1/org/apache/myfaces/tobago/compat/FacesUtils.java (original)
+++ myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/compat/FacesUtils.java Tue Sep 28 17:25:46 2010
@@ -24,6 +24,7 @@ import org.apache.myfaces.tobago.util.Va
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import javax.faces.application.Application;
import javax.faces.component.ActionSource;
import javax.faces.component.ContextCallback;
import javax.faces.component.EditableValueHolder;
@@ -43,10 +44,22 @@ import java.util.Comparator;
@SuppressWarnings("deprecation")
public class FacesUtils {
- private static final Logger LOG = LoggerFactory.getLogger(FacesUtils.class);
+ private static final Logger LOG = LoggerFactory.getLogger(FacesUtilsEL.class);
public static final Class[] VALIDATOR_ARGS = {FacesContext.class, UIComponent.class, Object.class};
+
+ static {
+ try {
+ Application.class.getMethod("getExpressionFactory");
+ binding = false;
+ } catch (NoSuchMethodException e) {
+ binding = true;
+ }
+ }
+
+ private static boolean binding;
+
public static boolean invokeOnComponent(
FacesContext context, UIComponent component, String clientId, ContextCallback callback) {
String thisClientId = component.getClientId(context);
@@ -114,91 +127,151 @@ public class FacesUtils {
public static Object getValueFromValueBindingOrValueExpression(
FacesContext context, UIComponent component, String name) {
- return component.getValueBinding(name).getValue(context);
+ if (binding) {
+ return component.getValueBinding(name).getValue(context);
+ } else {
+ return FacesUtilsEL.getValueFromValueBindingOrValueExpression(context, component, name);
+ }
}
public static boolean hasValueBindingOrValueExpression(UIComponent component, String name) {
- return component.getValueBinding(name) != null;
+ if (binding) {
+ return component.getValueBinding(name) != null;
+ } else {
+ return FacesUtilsEL.hasValueBindingOrValueExpression(component, name);
+ }
}
public static boolean isReadonlyValueBindingOrValueExpression(
FacesContext context, UIComponent component, String name) {
- return component.getValueBinding(name).isReadOnly(context);
+ if (binding) {
+ return component.getValueBinding(name).isReadOnly(context);
+ } else {
+ return FacesUtilsEL.isReadonlyValueBindingOrValueExpression(context, component, name);
+ }
}
public static String getExpressionString(UIComponent component, String name) {
- return component.getValueBinding(name).getExpressionString();
+ if (binding) {
+ return component.getValueBinding(name).getExpressionString();
+ } else {
+ return FacesUtilsEL.getExpressionString(component, name);
+ }
}
public static void setValueOfBindingOrExpression(
FacesContext context, Object value, UIComponent component, String bindingName) {
- ValueBinding vb = component.getValueBinding(bindingName);
- if (vb != null) {
- vb.setValue(context, value);
+ if (binding) {
+ ValueBinding vb = component.getValueBinding(bindingName);
+ if (vb != null) {
+ vb.setValue(context, value);
+ }
+ } else {
+ FacesUtilsEL.setValueOfBindingOrExpression(context, value, component, bindingName);
}
}
public static void setValueOfBindingOrExpression(
FacesContext context, Object value, Object bindingOrExpression) {
- if (bindingOrExpression instanceof ValueBinding) {
- ValueBinding vb = (ValueBinding) bindingOrExpression;
- vb.setValue(context, value);
+ if (binding) {
+ if (bindingOrExpression instanceof ValueBinding) {
+ ValueBinding vb = (ValueBinding) bindingOrExpression;
+ vb.setValue(context, value);
+ }
+ } else {
+ FacesUtilsEL.setValueOfBindingOrExpression(context, value, bindingOrExpression);
}
}
public static void copyValueBindingOrValueExpression(
UIComponent fromComponent, String fromName, UIComponent toComponent, String toName) {
- ValueBinding vb = fromComponent.getValueBinding(fromName);
- if (vb != null) {
- toComponent.setValueBinding(toName, vb);
+ if (binding) {
+ ValueBinding vb = fromComponent.getValueBinding(fromName);
+ if (vb != null) {
+ toComponent.setValueBinding(toName, vb);
+ }
+ } else {
+ FacesUtilsEL.copyValueBindingOrValueExpression(fromComponent, fromName, toComponent, toName);
}
}
public static Object getValueFromBindingOrExpression(Object obj) {
- if (obj instanceof ValueBinding) {
- return ((ValueBinding) obj).getValue(FacesContext.getCurrentInstance());
+ if (binding) {
+ if (obj instanceof ValueBinding) {
+ return ((ValueBinding) obj).getValue(FacesContext.getCurrentInstance());
+ }
+ } else {
+ return FacesUtilsEL.getValueFromBindingOrExpression(obj);
}
return null;
}
public static void setValidator(EditableValueHolder editableValueHolder, Object validator) {
- MethodBinding methodBinding =
- FacesContext.getCurrentInstance().getApplication().createMethodBinding(validator.toString(), VALIDATOR_ARGS);
- editableValueHolder.setValidator(methodBinding);
+ if (binding) {
+ MethodBinding methodBinding =
+ FacesContext.getCurrentInstance().getApplication().createMethodBinding(validator.toString(), VALIDATOR_ARGS);
+ editableValueHolder.setValidator(methodBinding);
+ } else {
+ FacesUtilsEL.setValidator(editableValueHolder, validator);
+ }
}
public static void setConverter(ValueHolder valueHolder, Object converterExpression) {
- if (converterExpression != null && converterExpression instanceof String) {
- String converterExpressionStr = (String) converterExpression;
- FacesContext context = FacesContext.getCurrentInstance();
- if (UIComponentTag.isValueReference(converterExpressionStr)) {
- ValueBinding valueBinding = context.getApplication().createValueBinding(converterExpressionStr);
- if (valueHolder instanceof UIComponent) {
- ((UIComponent) valueHolder).setValueBinding("converter", valueBinding);
+ if (binding) {
+ if (converterExpression != null && converterExpression instanceof String) {
+ String converterExpressionStr = (String) converterExpression;
+ FacesContext context = FacesContext.getCurrentInstance();
+ if (UIComponentTag.isValueReference(converterExpressionStr)) {
+ ValueBinding valueBinding = context.getApplication().createValueBinding(converterExpressionStr);
+ if (valueHolder instanceof UIComponent) {
+ ((UIComponent) valueHolder).setValueBinding("converter", valueBinding);
+ }
+ } else {
+ Converter converter = context.getApplication().createConverter(converterExpressionStr);
+ valueHolder.setConverter(converter);
}
- } else {
- Converter converter = context.getApplication().createConverter(converterExpressionStr);
- valueHolder.setConverter(converter);
}
+ } else {
+ FacesUtilsEL.setConverter(valueHolder, converterExpression);
}
}
public static void setBindingOrExpression(UIComponent component, String name, Object valueBindingOrExpression) {
- component.setValueBinding(name, (ValueBinding) valueBindingOrExpression);
+ if (binding) {
+ component.setValueBinding(name, (ValueBinding) valueBindingOrExpression);
+ } else {
+ FacesUtilsEL.setBindingOrExpression(component, name, valueBindingOrExpression);
+ }
}
- public static void addBindingOrExpressionTabChangeListener(
- TabChangeSource source, String type, Object bindingOrExpression) {
- source.addTabChangeListener(new ValueBindingTabChangeListener(type, (ValueBinding) bindingOrExpression));
+ public static void addBindingOrExpressionTabChangeListener(TabChangeSource source, String type,
+ Object bindingOrExpression) {
+ if (binding) {
+ source.addTabChangeListener(new ValueBindingTabChangeListener(type, (ValueBinding) bindingOrExpression));
+ } else {
+ FacesUtilsEL.addBindingOrExpressionTabChangeListener(source, type, bindingOrExpression);
+ }
}
public static Comparator getBindingOrExpressionComparator(
FacesContext facesContext, UIComponent child, String var, boolean descending, Comparator comparator) {
- ValueBinding valueBinding = child.getValueBinding("value");
- return new ValueBindingComparator(facesContext, var, valueBinding, descending, comparator);
+ if (binding) {
+ ValueBinding valueBinding = child.getValueBinding("value");
+ return new ValueBindingComparator(facesContext, var, valueBinding, descending, comparator);
+ } else {
+ return FacesUtilsEL.getBindingOrExpressionComparator(facesContext, child, var, descending, comparator);
+ }
}
public static void addBindingOrExpressionPopupActionListener(ActionSource actionSource, Object bindingOrExpression) {
- actionSource.addActionListener(new ValueBindingPopupActionListener((ValueBinding) bindingOrExpression));
+ if (binding) {
+ actionSource.addActionListener(new ValueBindingPopupActionListener(bindingOrExpression));
+ } else {
+ FacesUtilsEL.addBindingOrExpressionPopupActionListener(actionSource, bindingOrExpression);
+ }
+ }
+
+ public static boolean supportsEL() {
+ return !binding;
}
}
Propchange: myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/compat/FacesUtils.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/compat/FacesUtils.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/compat/FacesUtilsEL.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/compat/FacesUtilsEL.java?rev=1002278&view=auto
==============================================================================
--- myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/compat/FacesUtilsEL.java (added)
+++ myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/compat/FacesUtilsEL.java Tue Sep 28 17:25:46 2010
@@ -0,0 +1,205 @@
+package org.apache.myfaces.tobago.compat;
+
+/*
+ * 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.
+ */
+
+import org.apache.myfaces.tobago.event.TabChangeSource;
+import org.apache.myfaces.tobago.event.ValueExpressionPopupActionListener;
+import org.apache.myfaces.tobago.event.ValueExpressionTabChangeListener;
+import org.apache.myfaces.tobago.util.ValueExpressionComparator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.el.MethodExpression;
+import javax.el.ValueExpression;
+import javax.faces.component.ActionSource;
+import javax.faces.component.ContextCallback;
+import javax.faces.component.EditableValueHolder;
+import javax.faces.component.NamingContainer;
+import javax.faces.component.UIComponent;
+import javax.faces.component.ValueHolder;
+import javax.faces.context.FacesContext;
+import javax.faces.el.EvaluationException;
+import javax.faces.el.MethodBinding;
+import javax.faces.event.AbortProcessingException;
+import javax.faces.event.FacesEvent;
+import javax.faces.validator.MethodExpressionValidator;
+import java.util.Comparator;
+
+public class FacesUtilsEL {
+
+ private static final Logger LOG = LoggerFactory.getLogger(FacesUtilsEL.class);
+
+ public static boolean invokeOnComponent(
+ FacesContext context, UIComponent component, String clientId, ContextCallback callback) {
+ String thisClientId = component.getClientId(context);
+
+ if (clientId.equals(thisClientId)) {
+ callback.invokeContextCallback(context, component);
+ return true;
+ } else if (component instanceof NamingContainer) {
+ // This component is a naming container. If the client id shows it's inside this naming container,
+ // then process further.
+ // Otherwise we know the client id we're looking for is not in this naming container,
+ // so for improved performance short circuit and return false.
+ if (clientId.startsWith(thisClientId)
+ && (clientId.charAt(thisClientId.length()) == NamingContainer.SEPARATOR_CHAR)) {
+ if (invokeOnComponentFacetsAndChildren(context, component, clientId, callback)) {
+ return true;
+ }
+ }
+ } else {
+ if (invokeOnComponentFacetsAndChildren(context, component, clientId, callback)) {
+ return true;
+ }
+ }
+
+ return false;
+ }
+
+ private static boolean invokeOnComponentFacetsAndChildren(
+ FacesContext context, UIComponent component, String clientId, ContextCallback callback) {
+ for (java.util.Iterator<UIComponent> it = component.getFacetsAndChildren(); it.hasNext();) {
+ UIComponent child = it.next();
+
+ if (child.invokeOnComponent(context, clientId, callback)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ public static void invokeMethodBinding(FacesContext facesContext, MethodBinding methodBinding, FacesEvent event) {
+ if (methodBinding != null && event != null) {
+ try {
+ methodBinding.invoke(facesContext, new Object[]{event});
+ } catch (EvaluationException e) {
+ Throwable cause = e.getCause();
+ if (cause instanceof AbortProcessingException) {
+ throw (AbortProcessingException) cause;
+ } else {
+ throw e;
+ }
+ }
+ }
+ }
+
+ public static void invokeMethodBinding(
+ FacesContext facesContext, MethodExpression methodExpression, FacesEvent event) {
+
+ if (methodExpression != null && event != null) {
+ try {
+ methodExpression.invoke(facesContext.getELContext(), new Object[]{event});
+ } catch (Exception e) {
+ throw new AbortProcessingException(e);
+ }
+ }
+ }
+
+ public static Object getValueFromValueBindingOrValueExpression(
+ FacesContext context, UIComponent component, String name) {
+ return component.getValueExpression(name).getValue(context.getELContext());
+ }
+
+
+ public static boolean hasValueBindingOrValueExpression(UIComponent component, String name) {
+ return component.getValueExpression(name) != null;
+ }
+
+ public static boolean isReadonlyValueBindingOrValueExpression(
+ FacesContext context, UIComponent component, String name) {
+ return component.getValueExpression(name).isReadOnly(context.getELContext());
+ }
+
+
+ public static String getExpressionString(UIComponent component, String name) {
+ return component.getValueExpression(name).getExpressionString();
+ }
+
+ public static void setValueOfBindingOrExpression(
+ FacesContext context, Object value, UIComponent component, String bindingName) {
+ ValueExpression ve = component.getValueExpression(bindingName);
+ if (ve != null) {
+ ve.setValue(context.getELContext(), value);
+ }
+ }
+
+ public static void setValueOfBindingOrExpression(
+ FacesContext context, Object value, Object bindingOrExpression) {
+ if (bindingOrExpression instanceof ValueExpression) {
+ ValueExpression ve = (ValueExpression) bindingOrExpression;
+ ve.setValue(context.getELContext(), value);
+ }
+ }
+
+ public static void copyValueBindingOrValueExpression(
+ UIComponent fromComponent, String fromName, UIComponent toComponent, String toName) {
+ ValueExpression ve = fromComponent.getValueExpression(fromName);
+ if (ve != null) {
+ toComponent.setValueExpression(toName, ve);
+ }
+ }
+
+ public static Object getValueFromBindingOrExpression(Object obj) {
+ if (obj instanceof ValueExpression) {
+ ValueExpression expression = (ValueExpression) obj;
+ return expression.getValue(FacesContext.getCurrentInstance().getELContext());
+ }
+ return null;
+ }
+
+ public static void setValidator(EditableValueHolder editableValueHolder, Object validator) {
+ if (validator instanceof MethodExpression) {
+ editableValueHolder.addValidator(new MethodExpressionValidator((MethodExpression) validator));
+ } else {
+ LOG.error("Unknow instance for validator: " + (validator != null ? validator.getClass().getName() : validator));
+ }
+ }
+
+ public static void setConverter(ValueHolder valueHolder, Object converterExpression) {
+ if (converterExpression instanceof ValueExpression) {
+ ValueExpression expression = (ValueExpression) converterExpression;
+ if (!expression.isLiteralText()) {
+ ((UIComponent) valueHolder).setValueExpression("converter", expression);
+ } else {
+ valueHolder.setConverter(FacesContext.getCurrentInstance()
+ .getApplication().createConverter(expression.getExpressionString()));
+ }
+ }
+ }
+
+ public static void setBindingOrExpression(UIComponent component, String name, Object valueBindingOrExpression) {
+ component.setValueExpression(name, (ValueExpression) valueBindingOrExpression);
+ }
+
+ public static void addBindingOrExpressionTabChangeListener(
+ TabChangeSource source, String type, Object bindingOrExpression) {
+ if (bindingOrExpression instanceof ValueExpression) {
+ source.addTabChangeListener(new ValueExpressionTabChangeListener(type, (ValueExpression) bindingOrExpression));
+ }
+ }
+
+ public static Comparator getBindingOrExpressionComparator(
+ FacesContext facesContext, UIComponent child, String var, boolean descending, Comparator comparator) {
+ ValueExpression valueBinding = child.getValueExpression("value");
+ return new ValueExpressionComparator(facesContext, var, valueBinding, descending, comparator);
+ }
+
+ public static void addBindingOrExpressionPopupActionListener(ActionSource actionSource, Object bindingOrExpression) {
+ actionSource.addActionListener(new ValueExpressionPopupActionListener((ValueExpression) bindingOrExpression));
+ }
+}
Propchange: myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/compat/FacesUtilsEL.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/compat/FacesUtilsEL.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/component/MethodBindingToMethodExpression.java (from r1001002, myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.2/org/apache/myfaces/tobago/component/MethodBindingToMethodExpression.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/component/MethodBindingToMethodExpression.java?p2=myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/component/MethodBindingToMethodExpression.java&p1=myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.2/org/apache/myfaces/tobago/component/MethodBindingToMethodExpression.java&r1=1001002&r2=1002278&rev=1002278&view=diff
==============================================================================
(empty)
Propchange: myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/component/MethodBindingToMethodExpression.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/component/MethodBindingToMethodExpression.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/component/MethodExpressionToMethodBinding.java (from r1001002, myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.2/org/apache/myfaces/tobago/component/MethodExpressionToMethodBinding.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/component/MethodExpressionToMethodBinding.java?p2=myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/component/MethodExpressionToMethodBinding.java&p1=myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.2/org/apache/myfaces/tobago/component/MethodExpressionToMethodBinding.java&r1=1001002&r2=1002278&rev=1002278&view=diff
==============================================================================
(empty)
Propchange: myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/component/MethodExpressionToMethodBinding.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/component/MethodExpressionToMethodBinding.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/MethodExpressionStateChangeListener.java (from r1001002, myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.2/org/apache/myfaces/tobago/event/MethodExpressionStateChangeListener.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/MethodExpressionStateChangeListener.java?p2=myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/MethodExpressionStateChangeListener.java&p1=myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.2/org/apache/myfaces/tobago/event/MethodExpressionStateChangeListener.java&r1=1001002&r2=1002278&rev=1002278&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.2/org/apache/myfaces/tobago/event/MethodExpressionStateChangeListener.java (original)
+++ myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/MethodExpressionStateChangeListener.java Tue Sep 28 17:25:46 2010
@@ -18,6 +18,7 @@ package org.apache.myfaces.tobago.event;
*/
import org.apache.myfaces.tobago.compat.FacesUtils;
+import org.apache.myfaces.tobago.compat.FacesUtilsEL;
import javax.el.MethodExpression;
import javax.faces.component.StateHolder;
@@ -38,7 +39,7 @@ public class MethodExpressionStateChange
}
public void processSheetStateChange(SheetStateChangeEvent actionEvent) throws AbortProcessingException {
- FacesUtils.invokeMethodBinding(FacesContext.getCurrentInstance(), methodExpression, actionEvent);
+ FacesUtilsEL.invokeMethodBinding(FacesContext.getCurrentInstance(), methodExpression, actionEvent);
}
public void restoreState(FacesContext context, Object state) {
Propchange: myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/MethodExpressionStateChangeListener.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/MethodExpressionStateChangeListener.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/MethodExpressionTabChangeListener.java (from r1001002, myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.2/org/apache/myfaces/tobago/event/MethodExpressionTabChangeListener.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/MethodExpressionTabChangeListener.java?p2=myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/MethodExpressionTabChangeListener.java&p1=myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.2/org/apache/myfaces/tobago/event/MethodExpressionTabChangeListener.java&r1=1001002&r2=1002278&rev=1002278&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.2/org/apache/myfaces/tobago/event/MethodExpressionTabChangeListener.java (original)
+++ myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/MethodExpressionTabChangeListener.java Tue Sep 28 17:25:46 2010
@@ -18,6 +18,7 @@ package org.apache.myfaces.tobago.event;
*/
import org.apache.myfaces.tobago.compat.FacesUtils;
+import org.apache.myfaces.tobago.compat.FacesUtilsEL;
import javax.el.MethodExpression;
import javax.faces.component.StateHolder;
@@ -38,7 +39,7 @@ public class MethodExpressionTabChangeLi
}
public void processTabChange(TabChangeEvent actionEvent) throws AbortProcessingException {
- FacesUtils.invokeMethodBinding(FacesContext.getCurrentInstance(), methodExpression, actionEvent);
+ FacesUtilsEL.invokeMethodBinding(FacesContext.getCurrentInstance(), methodExpression, actionEvent);
}
public void restoreState(FacesContext context, Object state) {
Propchange: myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/MethodExpressionTabChangeListener.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/MethodExpressionTabChangeListener.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/MethodExpressionTreeExpansionListener.java (from r1001002, myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.2/org/apache/myfaces/tobago/event/MethodExpressionTreeExpansionListener.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/MethodExpressionTreeExpansionListener.java?p2=myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/MethodExpressionTreeExpansionListener.java&p1=myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.2/org/apache/myfaces/tobago/event/MethodExpressionTreeExpansionListener.java&r1=1001002&r2=1002278&rev=1002278&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.2/org/apache/myfaces/tobago/event/MethodExpressionTreeExpansionListener.java (original)
+++ myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/MethodExpressionTreeExpansionListener.java Tue Sep 28 17:25:46 2010
@@ -18,6 +18,7 @@ package org.apache.myfaces.tobago.event;
*/
import org.apache.myfaces.tobago.compat.FacesUtils;
+import org.apache.myfaces.tobago.compat.FacesUtilsEL;
import javax.el.ELContext;
import javax.el.MethodExpression;
@@ -39,7 +40,7 @@ public class MethodExpressionTreeExpansi
}
public void treeExpanded(TreeExpansionEvent event) {
- FacesUtils.invokeMethodBinding(FacesContext.getCurrentInstance(), methodExpression, event);
+ FacesUtilsEL.invokeMethodBinding(FacesContext.getCurrentInstance(), methodExpression, event);
}
private ELContext elContext() {
Propchange: myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/MethodExpressionTreeExpansionListener.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/MethodExpressionTreeExpansionListener.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/MethodExpressionTreeExpansionListener.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/ValueExpressionPopupActionListener.java (from r1001002, myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.2/org/apache/myfaces/tobago/event/ValueExpressionPopupActionListener.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/ValueExpressionPopupActionListener.java?p2=myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/ValueExpressionPopupActionListener.java&p1=myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.2/org/apache/myfaces/tobago/event/ValueExpressionPopupActionListener.java&r1=1001002&r2=1002278&rev=1002278&view=diff
==============================================================================
(empty)
Propchange: myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/ValueExpressionPopupActionListener.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/ValueExpressionPopupActionListener.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/ValueExpressionTabChangeListener.java (from r1001002, myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.2/org/apache/myfaces/tobago/event/ValueExpressionTabChangeListener.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/ValueExpressionTabChangeListener.java?p2=myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/ValueExpressionTabChangeListener.java&p1=myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.2/org/apache/myfaces/tobago/event/ValueExpressionTabChangeListener.java&r1=1001002&r2=1002278&rev=1002278&view=diff
==============================================================================
(empty)
Propchange: myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/ValueExpressionTabChangeListener.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/ValueExpressionTabChangeListener.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/util/MessageUtils.java (from r1001002, myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.1/org/apache/myfaces/tobago/util/MessageUtils.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/util/MessageUtils.java?p2=myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/util/MessageUtils.java&p1=myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.1/org/apache/myfaces/tobago/util/MessageUtils.java&r1=1001002&r2=1002278&rev=1002278&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.1/org/apache/myfaces/tobago/util/MessageUtils.java (original)
+++ myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/util/MessageUtils.java Tue Sep 28 17:25:46 2010
@@ -18,6 +18,7 @@ package org.apache.myfaces.tobago.util;
*/
import org.apache.myfaces.tobago.application.LabelValueBindingFacesMessage;
+import org.apache.myfaces.tobago.application.LabelValueExpressionFacesMessage;
import org.apache.myfaces.tobago.compat.FacesUtils;
import javax.faces.application.FacesMessage;
@@ -70,8 +71,24 @@ public class MessageUtils {
}
}
+ if (FacesUtils.supportsEL()) {
+ if (args != null && args.length > 0) {
+ MessageFormat format;
+ if (summary != null) {
+ format = new MessageFormat(summary, locale);
+ summary = format.format(args);
+ }
+
+ if (detail != null) {
+ format = new MessageFormat(detail, locale);
+ detail = format.format(args);
+ }
+ }
+ return new LabelValueExpressionFacesMessage(severity, summary, detail);
+ } else {
return new LabelValueBindingFacesMessage(severity, summary, detail, locale, args);
}
+ }
private static String getBundleString(ResourceBundle bundle, String key) {
try {
Propchange: myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/util/MessageUtils.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/util/MessageUtils.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/util/MessageUtils.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/util/ValueExpressionComparator.java (from r1001002, myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.2/org/apache/myfaces/tobago/util/ValueExpressionComparator.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/util/ValueExpressionComparator.java?p2=myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/util/ValueExpressionComparator.java&p1=myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.2/org/apache/myfaces/tobago/util/ValueExpressionComparator.java&r1=1001002&r2=1002278&rev=1002278&view=diff
==============================================================================
(empty)
Propchange: myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/util/ValueExpressionComparator.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/util/ValueExpressionComparator.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: myfaces/tobago/trunk/tobago-theme/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/pom.xml?rev=1002278&r1=1002277&r2=1002278&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-theme/pom.xml Tue Sep 28 17:25:46 2010
@@ -35,83 +35,4 @@
<!-- <module>tobago-theme-boccoo</module>-->
</modules>
- <profiles>
-
- <profile>
- <id>myfaces-1.1</id>
- <activation>
- <property>
- <name>jsf</name>
- <value>myfaces-1.1</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- </dependency>
- </dependencies>
- </profile>
-
- <profile>
- <id>myfaces-1.2</id>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- </dependency>
- </dependencies>
- </profile>
-
- <profile>
- <id>mojarra-1.1</id>
- <activation>
- <property>
- <name>jsf</name>
- <value>mojarra-1.1</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- </dependency>
- </dependencies>
- </profile>
-
- <profile>
- <id>mojarra-1.2</id>
- <activation>
- <property>
- <name>jsf</name>
- <value>mojarra-1.2</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- </dependency>
- </dependencies>
- </profile>
-
- <profile>
- <id>mojarra-2.0</id>
- <activation>
- <property>
- <name>jsf</name>
- <value>mojarra-2.0</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-api</artifactId>
- </dependency>
- </dependencies>
- </profile>
-
- </profiles>
-
</project>
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/pom.xml?rev=1002278&r1=1002277&r2=1002278&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/pom.xml Tue Sep 28 17:25:46 2010
@@ -77,11 +77,6 @@
<version>1.6R2</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<profiles>
<profile>
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/pom.xml?rev=1002278&r1=1002277&r2=1002278&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/pom.xml Tue Sep 28 17:25:46 2010
@@ -27,45 +27,6 @@
<name>Tobago Theme Standard</name>
<build>
<plugins>
-<!--
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>unpack-dojo</id>
- <phase>process-classes</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
-
- <artifactItems>
- <artifactItem>
- <groupId>org.dojotoolkit</groupId>
- <artifactId>dojo</artifactId>
- <version>1.0.1</version>
- <type>zip</type>
- <excludes>dojo/tests/**/*,**/*.txt</excludes>
- </artifactItem>
- <artifactItem>
- <groupId>org.dojotoolkit</groupId>
- <artifactId>dijit</artifactId>
- <version>1.0.1</version>
- <type>zip</type>
- <excludes>dijit/tests/**/*,dijit/bench/**/*,dijit/demos/**/*,dijit/themes/**/*</excludes>
- </artifactItem>
- </artifactItems>
- <outputDirectory>
- ${project.build.directory}/classes/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/dojo
- </outputDirectory>
- <unpackMarkersDirectory>${project.build.directory}/dojo
- </unpackMarkersDirectory>
- </configuration>
- </execution>
- </executions>
- </plugin>
--->
<!--<plugin>
<groupId>gr.abiss.mvn.plugins</groupId>
<artifactId>mvn-jstools</artifactId>
@@ -74,43 +35,6 @@
</plugins>
</build>
- <repositories>
-<!-- dojo not needed,
- <repository>
- <id>Temp dojo repository</id>
- <url>http://people.apache.org/~bommel/dojorepo</url>
- </repository>
--->
- <!--
- TODO use dojo maven repository see: http://blogs.webtide.com/gregw/2008/07/10/1215675720000.html
- <repository>
- <id>dojo</id>
- <name>Dojo Maven2 Repository</name>
- <url>http://download.dojotoolkit.org/maven2</url>
- <releases>
- <enabled>true</enabled>
- <updatePolicy>daily</updatePolicy>
- <checksumPolicy>fail</checksumPolicy>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>dojoSnapshots</id>
- <name>Dojo Maven2 Snapshot Repository</name>
- <url>http://download.dojotoolkit.org/maven2-snapshot</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>always</updatePolicy>
- <checksumPolicy>warn</checksumPolicy>
- </snapshots>
- </repository>-->
-
- </repositories>
<dependencies>
<dependency>
Modified: myfaces/tobago/trunk/tobago-tool/tobago-tool-annotation/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-tool/tobago-tool-annotation/pom.xml?rev=1002278&r1=1002277&r2=1002278&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/tobago-tool-annotation/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-tool/tobago-tool-annotation/pom.xml Tue Sep 28 17:25:46 2010
@@ -53,79 +53,5 @@
</dependencies>
</profile>
- <profile>
- <id>myfaces-1.1</id>
- <activation>
- <property>
- <name>jsf</name>
- <value>myfaces-1.1</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- </dependency>
- </dependencies>
- </profile>
-
- <profile>
- <id>myfaces-1.2</id>
- <dependencies>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- </dependency>
- </dependencies>
- </profile>
-
- <profile>
- <id>mojarra-1.1</id>
- <activation>
- <property>
- <name>jsf</name>
- <value>mojarra-1.1</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- </dependency>
- </dependencies>
- </profile>
-
- <profile>
- <id>mojarra-1.2</id>
- <activation>
- <property>
- <name>jsf</name>
- <value>mojarra-1.2</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- </dependency>
- </dependencies>
- </profile>
-
- <profile>
- <id>mojarra-2.0</id>
- <activation>
- <property>
- <name>jsf</name>
- <value>mojarra-2.0</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-api</artifactId>
- </dependency>
- </dependencies>
- </profile>
-
</profiles>
</project>
\ No newline at end of file