Spring/spring-webflow
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade JSF Mojarra to version 2.1.7

Browse Source
This commit is contained in:
Rossen Stoyanchev
2012-02-27 17:06:33 -05:00
parent 962b123d73
commit f764120279
7 changed files with 35 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-faces/.classpath
View File

@@ -8,8 +8,8 @@
<classpathentry combineaccessrules="false" kind="src" path="/spring-js"/>
<classpathentry combineaccessrules="false" kind="src" path="/spring-webflow"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="var" path="IVY_CACHE/com.sun.faces/jsf-impl/2.0.3/jsf-impl-2.0.3.jar" sourcepath="/IVY_CACHE/com.sun.faces/jsf-impl/2.0.3/jsf-impl-2.0.3-sources.jar"/>
<classpathentry kind="var" path="IVY_CACHE/com.sun.faces/jsf-api/2.0.3/jsf-api-2.0.3.jar" sourcepath="/IVY_CACHE/com.sun.faces/jsf-api/2.0.3/jsf-api-2.0.3-sources.jar"/>
<classpathentry kind="var" path="IVY_CACHE/com.sun.faces/jsf-impl/2.1.7/jsf-impl-2.1.7.jar" sourcepath="/IVY_CACHE/com.sun.faces/jsf-impl/2.1.7/jsf-impl-2.1.7-sources.jar"/>
<classpathentry kind="var" path="IVY_CACHE/com.sun.faces/jsf-api/2.1.7/jsf-api-2.1.7.jar" sourcepath="/IVY_CACHE/com.sun.faces/jsf-api/2.1.7/jsf-api-2.1.7-sources.jar"/>
<classpathentry kind="var" path="IVY_CACHE/javax.el/com.springsource.javax.el/1.0.0/com.springsource.javax.el-1.0.0.jar" sourcepath="IVY_CACHE/javax.el/com.springsource.javax.el/1.0.0/com.springsource.javax.el-sources-1.0.0.jar"/>
<classpathentry kind="var" path="IVY_CACHE/javax.servlet/com.springsource.javax.servlet/2.4.0/com.springsource.javax.servlet-2.4.0.jar" sourcepath="/IVY_CACHE/javax.servlet/com.springsource.javax.servlet/2.4.0/com.springsource.javax.servlet-sources-2.4.0.jar"/>
<classpathentry kind="var" path="IVY_CACHE/javax.portlet/com.springsource.javax.portlet/2.0.0/com.springsource.javax.portlet-2.0.0.jar" sourcepath="IVY_CACHE/javax.portlet/com.springsource.javax.portlet/2.0.0/com.springsource.javax.portlet-sources-2.0.0.jar"/>

9
spring-faces/ivy.xml
View File

@@ -11,6 +11,7 @@
<configurations>
<include file="${spring.build.dir}/common/default-ivy-configurations.xml"/>
<conf name="mojarra21" visibility="public"/>
<conf name="mojarra20" visibility="public"/>
<conf name="myfaces20" visibility="public"/>
<conf name="mojarra12" visibility="public"/>
@@ -44,9 +45,13 @@
<dependency org="org.springframework.webflow" name="org.springframework.js" rev="latest.integration" conf="compile->runtime"/>
<dependency org="org.springframework.webflow" name="org.springframework.webflow" rev="latest.integration" conf="compile->runtime"/>
<!-- JSF 2.1 Mojarra dependencies -->
<dependency org="com.sun.faces" name="jsf-api" rev="2.1.7" conf="provided, mojarra21->default" />
<dependency org="com.sun.faces" name="jsf-impl" rev="2.1.7" conf="provided, mojarra21->default" />
<!-- JSF 2.0 Mojarra dependencies -->
<dependency org="com.sun.faces" name="jsf-api" rev="2.0.3" conf="provided, mojarra20->default" />
<dependency org="com.sun.faces" name="jsf-impl" rev="2.0.3" conf="provided, mojarra20->default" />
<dependency org="com.sun.faces" name="jsf-api" rev="2.0.6" conf="provided, mojarra20->default" />
<dependency org="com.sun.faces" name="jsf-impl" rev="2.0.6" conf="provided, mojarra20->default" />
<!-- JSF 2.0 MyFaces dependencies -->
<dependency org="org.apache.myfaces.core" name="myfaces-api" rev="2.0.1-SNAPSHOT" conf="myfaces20->default" />

4
spring-faces/pom.xml
View File

@@ -108,13 +108,13 @@
<dependency>
<groupId>com.sun.faces</groupId>
<artifactId>jsf-api</artifactId>
<version>2.0.3</version>
<version>2.1.7</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.sun.faces</groupId>
<artifactId>jsf-impl</artifactId>
<version>2.0.3</version>
<version>2.1.7</version>
<scope>provided</scope>
</dependency>
<dependency>

19
spring-faces/src/main/java/org/springframework/faces/webflow/Jsf2FlowFacesContext.java
View File

@@ -127,6 +127,12 @@ public class Jsf2FlowFacesContext extends FlowFacesContext {
getDelegate().validationFailed();
}
// --------------- JSF 2.1 Pass-through delegate methods ------------------//
public boolean isReleased() {
return getDelegate().isReleased();
}
protected class Jsf2FlowExternalContext extends FlowExternalContext {
Log logger = LogFactory.getLog(FlowExternalContext.class);
@@ -242,5 +248,18 @@ public class Jsf2FlowFacesContext extends FlowFacesContext {
return delegate.encodePartialActionURL(url);
}
// --------------- JSF 2.1 Pass-through delegate methods ------------------//
public int getSessionMaxInactiveInterval() {
return delegate.getSessionMaxInactiveInterval();
}
public boolean isSecure() {
return delegate.isSecure();
}
public void setSessionMaxInactiveInterval(int interval) {
delegate.setSessionMaxInactiveInterval(interval);
}
}
}

4
spring-webflow-samples/booking-faces/.classpath
View File

@@ -62,8 +62,8 @@
<classpathentry kind="var" path="M2_REPO/javassist/javassist/3.9.0.GA/javassist-3.9.0.GA.jar" sourcepath="M2_REPO/javassist/javassist/3.9.0.GA/javassist-3.9.0.GA-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/com/sun/xml/bind/jaxb-impl/2.1.3/jaxb-impl-2.1.3.jar" sourcepath="M2_REPO/com/sun/xml/bind/jaxb-impl/2.1.3/jaxb-impl-2.1.3-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/slf4j/jcl-over-slf4j/1.5.10/jcl-over-slf4j-1.5.10.jar" sourcepath="M2_REPO/org/slf4j/jcl-over-slf4j/1.5.10/jcl-over-slf4j-1.5.10-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/com/sun/faces/jsf-api/2.0.3/jsf-api-2.0.3.jar" sourcepath="M2_REPO/com/sun/faces/jsf-api/2.0.3/jsf-api-2.0.3-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/com/sun/faces/jsf-impl/2.0.3/jsf-impl-2.0.3.jar" sourcepath="M2_REPO/com/sun/faces/jsf-impl/2.0.3/jsf-impl-2.0.3-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/com/sun/faces/jsf-api/2.1.7/jsf-api-2.1.7.jar" sourcepath="M2_REPO/com/sun/faces/jsf-api/2.1.7/jsf-api-2.1.7-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/com/sun/faces/jsf-impl/2.1.7/jsf-impl-2.1.7.jar" sourcepath="M2_REPO/com/sun/faces/jsf-impl/2.1.7/jsf-impl-2.1.7-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/junit/junit/3.8.2/junit-3.8.2.jar" sourcepath="M2_REPO/junit/junit/3.8.2/junit-3.8.2-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.15/log4j-1.2.15.jar" sourcepath="M2_REPO/log4j/log4j/1.2.15/log4j-1.2.15-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/primefaces/primefaces/2.2.1/primefaces-2.2.1.jar" sourcepath="M2_REPO/org/primefaces/primefaces/2.2.1/primefaces-2.2.1-sources.jar"/>

4
spring-webflow-samples/booking-faces/.settings/org.eclipse.wst.common.component
View File

@@ -66,10 +66,10 @@
<dependent-module archiveName="jcl-over-slf4j-1.5.10.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/slf4j/jcl-over-slf4j/1.5.10/jcl-over-slf4j-1.5.10.jar">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="jsf-api-2.0.3.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/com/sun/faces/jsf-api/2.0.3/jsf-api-2.0.3.jar">
<dependent-module archiveName="jsf-api-2.1.7.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/com/sun/faces/jsf-api/2.1.7/jsf-api-2.1.7.jar">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="jsf-impl-2.0.3.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/com/sun/faces/jsf-impl/2.0.3/jsf-impl-2.0.3.jar">
<dependent-module archiveName="jsf-impl-2.1.7.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/com/sun/faces/jsf-impl/2.1.7/jsf-impl-2.1.7.jar">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="jta-1.1.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/javax/transaction/jta/1.1/jta-1.1.jar">

2
spring-webflow-samples/booking-faces/pom.xml
View File

@@ -11,7 +11,7 @@
<org.springframework-version>3.0.5.RELEASE</org.springframework-version>
<org.springsecurity-version>3.0.2.RELEASE</org.springsecurity-version>
<org.slf4j-version>1.5.10</org.slf4j-version>
<jsf-version>2.0.3</jsf-version>
<jsf-version>2.1.7</jsf-version>
<primefaces-version>2.2.1</primefaces-version>
</properties>
<dependencies>