You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2012/11/16 04:05:38 UTC
svn commit: r1410177 - in /myfaces/core/branches/2.1.x-client-window: ./
api/src/main/javascript/META-INF/resources/myfaces/_impl/_util/
impl/src/main/java/org/apache/myfaces/renderkit/
impl/src/main/java/org/apache/myfaces/view/ impl/src/main/old/ imp...
Author: lu4242
Date: Fri Nov 16 03:05:36 2012
New Revision: 1410177
URL: http://svn.apache.org/viewvc?rev=1410177&view=rev
Log:
merge revisions 1406527,1406532,1408903,1409426,1409468,1409476,1410155 from 2.1.x branch
Removed:
myfaces/core/branches/2.1.x-client-window/impl/src/main/old/
Modified:
myfaces/core/branches/2.1.x-client-window/ (props changed)
myfaces/core/branches/2.1.x-client-window/api/src/main/javascript/META-INF/resources/myfaces/_impl/_util/_Dom.js
myfaces/core/branches/2.1.x-client-window/impl/src/main/java/org/apache/myfaces/renderkit/ServerSideStateCacheImpl.java
myfaces/core/branches/2.1.x-client-window/impl/src/main/java/org/apache/myfaces/view/ViewDeclarationLanguageFactoryImpl.java
myfaces/core/branches/2.1.x-client-window/impl/src/main/resources/META-INF/faces-config20.vm (props changed)
myfaces/core/branches/2.1.x-client-window/impl/src/test/java/org/apache/myfaces/renderkit/ServerSideStateCacheTest.java
myfaces/core/branches/2.1.x-client-window/parent/pom.xml (props changed)
myfaces/core/branches/2.1.x-client-window/parent/src/ (props changed)
myfaces/core/branches/2.1.x-client-window/shared/ (props changed)
myfaces/core/branches/2.1.x-client-window/shared-public/pom.xml (props changed)
myfaces/core/branches/2.1.x-client-window/shared-public/src/ (props changed)
myfaces/core/branches/2.1.x-client-window/shared-public/src/main/java/org/apache/myfaces/shared/util/AttachedDeltaWrapper.java (props changed)
myfaces/core/branches/2.1.x-client-window/shared-public/src/main/java/org/apache/myfaces/shared/util/ComponentUtils.java (props changed)
myfaces/core/branches/2.1.x-client-window/shared-public/src/main/java/org/apache/myfaces/shared/util/DebugUtils.java (props changed)
myfaces/core/branches/2.1.x-client-window/shared-public/src/main/java/org/apache/myfaces/shared/util/RendererUtils.java (props changed)
myfaces/core/branches/2.1.x-client-window/shared-public/src/main/java/org/apache/myfaces/shared/util/TagUtils.java (props changed)
myfaces/core/branches/2.1.x-client-window/shared-public/src/main/java/org/apache/myfaces/shared/util/renderkit/ (props changed)
Propchange: myfaces/core/branches/2.1.x-client-window/
------------------------------------------------------------------------------
Merged /myfaces/core/trunk:r1406527,1406532,1408903,1409426,1409468,1409476,1410155
Modified: myfaces/core/branches/2.1.x-client-window/api/src/main/javascript/META-INF/resources/myfaces/_impl/_util/_Dom.js
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.1.x-client-window/api/src/main/javascript/META-INF/resources/myfaces/_impl/_util/_Dom.js?rev=1410177&r1=1410176&r2=1410177&view=diff
==============================================================================
--- myfaces/core/branches/2.1.x-client-window/api/src/main/javascript/META-INF/resources/myfaces/_impl/_util/_Dom.js (original)
+++ myfaces/core/branches/2.1.x-client-window/api/src/main/javascript/META-INF/resources/myfaces/_impl/_util/_Dom.js Fri Nov 16 03:05:36 2012
@@ -122,7 +122,12 @@ _MF_SINGLTN(_PFX_UTIL + "_Dom", Object,
finalScripts = [],
execScrpt = function(item) {
var tagName = item.tagName;
- if (tagName && _Lang.equalsIgnoreCase(tagName, "script")) {
+ var itemType = item.type || "";
+ if(tagName && _Lang.equalsIgnoreCase(tagName, "script") &&
+ (itemType === "" || _Lang.equalsIgnoreCase(itemType,"text/javascript") ||
+ _Lang.equalsIgnoreCase(itemType,"javascript") ||
+ _Lang.equalsIgnoreCase(itemType,"text/ecmascript") ||
+ _Lang.equalsIgnoreCase(itemType,"ecmascript"))) {
var src = item.getAttribute('src');
if ('undefined' != typeof src
&& null != src
Modified: myfaces/core/branches/2.1.x-client-window/impl/src/main/java/org/apache/myfaces/renderkit/ServerSideStateCacheImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.1.x-client-window/impl/src/main/java/org/apache/myfaces/renderkit/ServerSideStateCacheImpl.java?rev=1410177&r1=1410176&r2=1410177&view=diff
==============================================================================
--- myfaces/core/branches/2.1.x-client-window/impl/src/main/java/org/apache/myfaces/renderkit/ServerSideStateCacheImpl.java (original)
+++ myfaces/core/branches/2.1.x-client-window/impl/src/main/java/org/apache/myfaces/renderkit/ServerSideStateCacheImpl.java Fri Nov 16 03:05:36 2012
@@ -1457,7 +1457,7 @@ class ServerSideStateCacheImpl extends S
{
if (context.isProjectStage(ProjectStage.Production))
{
- return new IntIntSerializedViewKey(viewId.hashCode(), key);
+ return new IntIntSerializedViewKey(viewId == null ? 0 : viewId.hashCode(), key);
}
else
{
@@ -1487,7 +1487,7 @@ class ServerSideStateCacheImpl extends S
{
if (context.isProjectStage(ProjectStage.Production))
{
- return new IntByteArraySerializedViewKey(viewId.hashCode(), key);
+ return new IntByteArraySerializedViewKey(viewId == null ? 0 : viewId.hashCode(), key);
}
else
{
Modified: myfaces/core/branches/2.1.x-client-window/impl/src/main/java/org/apache/myfaces/view/ViewDeclarationLanguageFactoryImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.1.x-client-window/impl/src/main/java/org/apache/myfaces/view/ViewDeclarationLanguageFactoryImpl.java?rev=1410177&r1=1410176&r2=1410177&view=diff
==============================================================================
--- myfaces/core/branches/2.1.x-client-window/impl/src/main/java/org/apache/myfaces/view/ViewDeclarationLanguageFactoryImpl.java (original)
+++ myfaces/core/branches/2.1.x-client-window/impl/src/main/java/org/apache/myfaces/view/ViewDeclarationLanguageFactoryImpl.java Fri Nov 16 03:05:36 2012
@@ -21,7 +21,6 @@ package org.apache.myfaces.view;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.faces.FacesException;
import javax.faces.context.FacesContext;
import javax.faces.view.ViewDeclarationLanguage;
import javax.faces.view.ViewDeclarationLanguageFactory;
@@ -90,7 +89,13 @@ public class ViewDeclarationLanguageFact
}
}
- throw new FacesException("Cannot find a valid PDL for view id " + viewId);
+ // throw new FacesException("Cannot find a valid PDL for view id " + viewId);
+ // It does not have sense to throw an exception in this point. Instead
+ // just return null, to indicate that no VDL can handle the viewId.
+ // For example, in org.apache.myfaces.shared.application.DefaultViewHandlerSupport
+ // first getViewDeclarationLanguage(String viewId) is called and if returns null
+ // try the default strategy (look for a file in web folder).
+ return null;
}
/**
Propchange: myfaces/core/branches/2.1.x-client-window/impl/src/main/resources/META-INF/faces-config20.vm
------------------------------------------------------------------------------
Merged /myfaces/core/trunk/impl/src/main/resources/META-INF/faces-config20.vm:r1406527,1406532,1408903,1409426,1409468,1409476,1410155
Modified: myfaces/core/branches/2.1.x-client-window/impl/src/test/java/org/apache/myfaces/renderkit/ServerSideStateCacheTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.1.x-client-window/impl/src/test/java/org/apache/myfaces/renderkit/ServerSideStateCacheTest.java?rev=1410177&r1=1410176&r2=1410177&view=diff
==============================================================================
--- myfaces/core/branches/2.1.x-client-window/impl/src/test/java/org/apache/myfaces/renderkit/ServerSideStateCacheTest.java (original)
+++ myfaces/core/branches/2.1.x-client-window/impl/src/test/java/org/apache/myfaces/renderkit/ServerSideStateCacheTest.java Fri Nov 16 03:05:36 2012
@@ -28,7 +28,6 @@ import javax.faces.application.StateMana
import org.apache.myfaces.application.StateCache;
import org.apache.myfaces.test.base.junit4.AbstractJsfConfigurableMultipleRequestsTestCase;
-import org.apache.myfaces.view.facelets.tag.composite.CompositeResouceWrapper;
import org.junit.Test;
import org.testng.Assert;
@@ -38,7 +37,6 @@ public class ServerSideStateCacheTest ex
@Test
public void testNumberOfSequentialViewsInSession() throws Exception
{
-
servletContext.addInitParameter(StateManager.STATE_SAVING_METHOD_PARAM_NAME, StateManager.STATE_SAVING_METHOD_SERVER);
servletContext.addInitParameter("org.apache.myfaces.NUMBER_OF_VIEWS_IN_SESSION", "5");
servletContext.addInitParameter("org.apache.myfaces.NUMBER_OF_SEQUENTIAL_VIEWS_IN_SESSION", "2");
@@ -169,7 +167,36 @@ public class ServerSideStateCacheTest ex
}
}
-
+
+ @Test
+ public void testNonExistingViewId() throws Exception
+ {
+ servletContext.addInitParameter(StateManager.STATE_SAVING_METHOD_PARAM_NAME, StateManager.STATE_SAVING_METHOD_SERVER);
+ servletContext.addInitParameter("org.apache.myfaces.NUMBER_OF_VIEWS_IN_SESSION", "5");
+ servletContext.addInitParameter("org.apache.myfaces.NUMBER_OF_SEQUENTIAL_VIEWS_IN_SESSION", "2");
+
+ // this issue only happens in projectstage Production
+ servletContext.addInitParameter("faces.PROJECT_STAGE", "Production");
+
+ try
+ {
+ // Initialization
+ setupRequest();
+
+ // we need to take a viewId which is null -> not existing.
+ facesContext.getViewRoot().setViewId(null);
+
+ StateCache stateCache = new ServerSideStateCacheImpl();
+ Object savedToken = stateCache.saveSerializedView(facesContext, 1);
+
+ }
+ finally
+ {
+ tearDownRequest();
+ }
+
+ }
+
public void tryStateKeySerialization() throws Exception
{
// Initialization
Propchange: myfaces/core/branches/2.1.x-client-window/parent/pom.xml
------------------------------------------------------------------------------
Merged /myfaces/core/trunk/parent/pom.xml:r1406527,1406532,1408903,1409426,1409468,1409476,1410155
Propchange: myfaces/core/branches/2.1.x-client-window/parent/src/
------------------------------------------------------------------------------
Merged /myfaces/core/trunk/parent/src:r1406527,1406532,1408903,1409426,1409468,1409476,1410155
Propchange: myfaces/core/branches/2.1.x-client-window/shared/
------------------------------------------------------------------------------
Merged /myfaces/core/trunk/shared:r1406527,1406532,1408903,1409426,1409468,1409476,1410155
Propchange: myfaces/core/branches/2.1.x-client-window/shared-public/pom.xml
------------------------------------------------------------------------------
Merged /myfaces/core/trunk/shared-public/pom.xml:r1406527,1406532,1408903,1409426,1409468,1409476,1410155
Propchange: myfaces/core/branches/2.1.x-client-window/shared-public/src/
------------------------------------------------------------------------------
Merged /myfaces/core/trunk/shared-public/src:r1406527,1406532,1408903,1409426,1409468,1409476,1410155
Propchange: myfaces/core/branches/2.1.x-client-window/shared-public/src/main/java/org/apache/myfaces/shared/util/AttachedDeltaWrapper.java
------------------------------------------------------------------------------
Merged /myfaces/core/trunk/shared-public/src/main/java/org/apache/myfaces/shared/util/AttachedDeltaWrapper.java:r1406527,1406532,1408903,1409426,1409468,1409476,1410155
Propchange: myfaces/core/branches/2.1.x-client-window/shared-public/src/main/java/org/apache/myfaces/shared/util/ComponentUtils.java
------------------------------------------------------------------------------
Merged /myfaces/core/trunk/shared-public/src/main/java/org/apache/myfaces/shared/util/ComponentUtils.java:r1406527,1406532,1408903,1409426,1409468,1409476,1410155
Propchange: myfaces/core/branches/2.1.x-client-window/shared-public/src/main/java/org/apache/myfaces/shared/util/DebugUtils.java
------------------------------------------------------------------------------
Merged /myfaces/core/trunk/shared-public/src/main/java/org/apache/myfaces/shared/util/DebugUtils.java:r1406527,1406532,1408903,1409426,1409468,1409476,1410155
Propchange: myfaces/core/branches/2.1.x-client-window/shared-public/src/main/java/org/apache/myfaces/shared/util/RendererUtils.java
------------------------------------------------------------------------------
Merged /myfaces/core/trunk/shared-public/src/main/java/org/apache/myfaces/shared/util/RendererUtils.java:r1406527,1406532,1408903,1409426,1409468,1409476,1410155
Propchange: myfaces/core/branches/2.1.x-client-window/shared-public/src/main/java/org/apache/myfaces/shared/util/TagUtils.java
------------------------------------------------------------------------------
Merged /myfaces/core/trunk/shared-public/src/main/java/org/apache/myfaces/shared/util/TagUtils.java:r1406527,1406532,1408903,1409426,1409468,1409476,1410155
Propchange: myfaces/core/branches/2.1.x-client-window/shared-public/src/main/java/org/apache/myfaces/shared/util/renderkit/
------------------------------------------------------------------------------
Merged /myfaces/core/trunk/shared-public/src/main/java/org/apache/myfaces/shared/util/renderkit:r1406527,1406532,1408903,1409426,1409468,1409476,1410155