myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From strub...@apache.org
Subject svn commit: r1409887 - in /myfaces/core/trunk/impl/src: main/java/org/apache/myfaces/application/ main/java/org/apache/myfaces/application/viewstate/ main/java/org/apache/myfaces/renderkit/html/ main/java/org/apache/myfaces/renderkit/viewstate/ main/ja...
Date Thu, 15 Nov 2012 17:17:13 GMT
Author: struberg
Date: Thu Nov 15 17:17:10 2012
New Revision: 1409887

URL: http://svn.apache.org/viewvc?rev=1409887&view=rev
Log:
MYFACES-3645 move viewstate key handling to application

This actually has nothing to do with the RenderKit.

Added:
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/viewstate/
      - copied from r1409854, myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/viewstate/
    myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/application/viewstate/
    myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/application/viewstate/ClientSideStateCacheTest.java
      - copied, changed from r1409854, myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/renderkit/viewstate/ClientSideStateCacheTest.java
    myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/application/viewstate/ServerSideStateCacheTest.java
  (contents, props changed)
      - copied, changed from r1409854, myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/renderkit/viewstate/ServerSideStateCacheTest.java
Removed:
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/viewstate/
    myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/renderkit/viewstate/
Modified:
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/StateCache.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/StateManagerImpl.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/ViewHandlerImpl.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/viewstate/ClientSideStateCacheImpl.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/viewstate/CounterKeyFactory.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/viewstate/KeyFactory.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/viewstate/RandomKeyFactory.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/viewstate/SecureRandomKeyFactory.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/viewstate/SerializedViewCollection.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/viewstate/SerializedViewKey.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/viewstate/ServerSideStateCacheImpl.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/viewstate/SessionIdGenerator.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/viewstate/SessionViewStorageFactory.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/viewstate/StateCacheFactoryImpl.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/viewstate/StateCacheUtils.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlResponseStateManager.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/jsp/JspViewDeclarationLanguage.java

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/StateCache.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/StateCache.java?rev=1409887&r1=1409886&r2=1409887&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/StateCache.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/StateCache.java Thu
Nov 15 17:17:10 2012
@@ -55,7 +55,7 @@ public abstract class StateCache<K, V>
      * viewState that can be used by the underlying ResponseStateManager to write the state.
      * 
      * @param facesContext
-     * @param state The state that will be used to derive the token returned.
+     * @param serializedView The state that will be used to derive the token returned.
      * @return A token (usually encoded on javax.faces.ViewState input hidden field) that
will be passed to 
      *         ResponseStateManager.writeState or ResponseStateManager.getViewState to be

      *         output to the client.

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/StateManagerImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/StateManagerImpl.java?rev=1409887&r1=1409886&r2=1409887&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/StateManagerImpl.java
(original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/StateManagerImpl.java
Thu Nov 15 17:17:10 2012
@@ -37,7 +37,7 @@ import javax.faces.render.ResponseStateM
 import javax.faces.view.StateManagementStrategy;
 import javax.faces.view.ViewDeclarationLanguage;
 
-import org.apache.myfaces.renderkit.viewstate.StateCacheUtils;
+import org.apache.myfaces.application.viewstate.StateCacheUtils;
 
 public class StateManagerImpl extends StateManager
 {

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/ViewHandlerImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/ViewHandlerImpl.java?rev=1409887&r1=1409886&r2=1409887&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/ViewHandlerImpl.java
(original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/ViewHandlerImpl.java
Thu Nov 15 17:17:10 2012
@@ -45,7 +45,7 @@ import javax.faces.view.ViewDeclarationL
 import javax.faces.view.ViewMetadata;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.myfaces.renderkit.viewstate.StateCacheUtils;
+import org.apache.myfaces.application.viewstate.StateCacheUtils;
 import org.apache.myfaces.shared.application.DefaultViewHandlerSupport;
 import org.apache.myfaces.shared.application.InvalidViewIdException;
 import org.apache.myfaces.shared.application.ViewHandlerSupport;

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/viewstate/ClientSideStateCacheImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/viewstate/ClientSideStateCacheImpl.java?rev=1409887&r1=1409854&r2=1409887&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/viewstate/ClientSideStateCacheImpl.java
(original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/viewstate/ClientSideStateCacheImpl.java
Thu Nov 15 17:17:10 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.renderkit.viewstate;
+package org.apache.myfaces.application.viewstate;
 
 import javax.faces.context.ExternalContext;
 import javax.faces.context.FacesContext;

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/viewstate/CounterKeyFactory.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/viewstate/CounterKeyFactory.java?rev=1409887&r1=1409854&r2=1409887&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/viewstate/CounterKeyFactory.java
(original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/viewstate/CounterKeyFactory.java
Thu Nov 15 17:17:10 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.renderkit.viewstate;
+package org.apache.myfaces.application.viewstate;
 
 import org.apache.myfaces.shared.renderkit.RendererUtils;
 
@@ -28,7 +28,7 @@ import java.util.Map;
  * View Key factory which incrementally counts upwards
  * in each session.
  */
-public class CounterKeyFactory extends KeyFactory<Integer, String>
+public class CounterKeyFactory extends KeyFactory<Integer>
 {
     /**
      * Take the counter from session scope and increment

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/viewstate/KeyFactory.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/viewstate/KeyFactory.java?rev=1409887&r1=1409854&r2=1409887&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/viewstate/KeyFactory.java
(original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/viewstate/KeyFactory.java
Thu Nov 15 17:17:10 2012
@@ -16,17 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.renderkit.viewstate;
+package org.apache.myfaces.application.viewstate;
 
 import javax.faces.context.FacesContext;
 
 /**
- * Factory for handling View Keys
+ * Factory for handling ViewState Keys
  * @parem K the type of the generated key
- * @parem V the type which gets stored.
- * TODO: V is ALWAYS String, right?
  */
-public abstract class KeyFactory<K, V>
+public abstract class KeyFactory<K>
 {
 
     /**
@@ -43,14 +41,14 @@ public abstract class KeyFactory<K, V>
      * @param key
      * @return
      */
-    public abstract V encode(K key);
+    public abstract String encode(K key);
 
     /**
      * Decode a view state session token into a key
      *
-     * @param value
+     * @param encodedValue
      * @return
      */
-    public abstract K decode(V value);
+    public abstract K decode(String encodedValue);
 
 }

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/viewstate/RandomKeyFactory.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/viewstate/RandomKeyFactory.java?rev=1409887&r1=1409854&r2=1409887&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/viewstate/RandomKeyFactory.java
(original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/viewstate/RandomKeyFactory.java
Thu Nov 15 17:17:10 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.renderkit.viewstate;
+package org.apache.myfaces.application.viewstate;
 
 import org.apache.commons.codec.DecoderException;
 import org.apache.commons.codec.binary.Hex;
@@ -31,7 +31,7 @@ import java.util.Random;
 /**
  * View key factory which uses a random generator.
  */
-class RandomKeyFactory extends KeyFactory<byte[], String>
+class RandomKeyFactory extends KeyFactory<byte[]>
 {
     private final Random random;
     private final int length;

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/viewstate/SecureRandomKeyFactory.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/viewstate/SecureRandomKeyFactory.java?rev=1409887&r1=1409854&r2=1409887&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/viewstate/SecureRandomKeyFactory.java
(original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/viewstate/SecureRandomKeyFactory.java
Thu Nov 15 17:17:10 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.renderkit.viewstate;
+package org.apache.myfaces.application.viewstate;
 
 import org.apache.commons.codec.DecoderException;
 import org.apache.commons.codec.binary.Hex;
@@ -32,7 +32,7 @@ import java.util.Map;
  * counter ensures uniqueness, and the random number prevents guess the next
  * session token.
  */
-public class SecureRandomKeyFactory extends KeyFactory<byte[], String>
+public class SecureRandomKeyFactory extends KeyFactory<byte[]>
 {
     private final SessionIdGenerator sessionIdGenerator;
     private final int length;

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/viewstate/SerializedViewCollection.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/viewstate/SerializedViewCollection.java?rev=1409887&r1=1409854&r2=1409887&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/viewstate/SerializedViewCollection.java
(original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/viewstate/SerializedViewCollection.java
Thu Nov 15 17:17:10 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.renderkit.viewstate;
+package org.apache.myfaces.application.viewstate;
 
 import org.apache.commons.collections.map.AbstractReferenceMap;
 import org.apache.commons.collections.map.ReferenceMap;
@@ -123,7 +123,7 @@ class SerializedViewCollection implement
 
                     if (_serializedViews.containsKey(keyToRemove) &&
                         !ServerSideStateCacheImpl.CACHE_OLD_VIEWS_IN_SESSION_MODE_OFF.
-                                equals(getCacheOldViewsInSessionMode(context)))
+                                equals( getCacheOldViewsInSessionMode( context ) ))
                     {
                         getOldSerializedViewsMap().put(keyToRemove, _serializedViews.remove(keyToRemove));
                     }
@@ -156,7 +156,7 @@ class SerializedViewCollection implement
 
             if (_serializedViews.containsKey(key) &&
                 !ServerSideStateCacheImpl.CACHE_OLD_VIEWS_IN_SESSION_MODE_OFF.
-                        equals(getCacheOldViewsInSessionMode(context)))
+                        equals( getCacheOldViewsInSessionMode( context ) ))
             {
 
                 getOldSerializedViewsMap().put(key, _serializedViews.remove(key));

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/viewstate/SerializedViewKey.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/viewstate/SerializedViewKey.java?rev=1409887&r1=1409854&r2=1409887&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/viewstate/SerializedViewKey.java
(original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/viewstate/SerializedViewKey.java
Thu Nov 15 17:17:10 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.renderkit.viewstate;
+package org.apache.myfaces.application.viewstate;
 
 import java.io.Serializable;
 import java.util.Arrays;

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/viewstate/ServerSideStateCacheImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/viewstate/ServerSideStateCacheImpl.java?rev=1409887&r1=1409854&r2=1409887&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/viewstate/ServerSideStateCacheImpl.java
(original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/viewstate/ServerSideStateCacheImpl.java
Thu Nov 15 17:17:10 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.renderkit.viewstate;
+package org.apache.myfaces.application.viewstate;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -255,7 +255,7 @@ class ServerSideStateCacheImpl extends S
 
     //------------------------------------- METHODS COPIED FROM JspStateManagerImpl--------------------------------
 
-    protected Object getServerStateId(FacesContext facesContext, Object state)
+    protected Object getServerStateId(FacesContext facesContext, String state)
     {
       if (state != null)
       {
@@ -599,7 +599,8 @@ class ServerSideStateCacheImpl extends S
             log.finest("Restoring view from session");
         }
 
-        Object serverStateId = getServerStateId(facesContext, viewState);
+        //X TODO the viewState is always a String!
+        Object serverStateId = getServerStateId(facesContext, (String) viewState);
 
         return (serverStateId == null)
                 ? null

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/viewstate/SessionIdGenerator.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/viewstate/SessionIdGenerator.java?rev=1409887&r1=1409854&r2=1409887&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/viewstate/SessionIdGenerator.java
(original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/viewstate/SessionIdGenerator.java
Thu Nov 15 17:17:10 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.renderkit.viewstate;
+package org.apache.myfaces.application.viewstate;
 
 import java.security.NoSuchAlgorithmException;
 import java.security.NoSuchProviderException;

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/viewstate/SessionViewStorageFactory.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/viewstate/SessionViewStorageFactory.java?rev=1409887&r1=1409854&r2=1409887&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/viewstate/SessionViewStorageFactory.java
(original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/viewstate/SessionViewStorageFactory.java
Thu Nov 15 17:17:10 2012
@@ -16,23 +16,23 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.renderkit.viewstate;
+package org.apache.myfaces.application.viewstate;
 
 import javax.faces.context.FacesContext;
 
 /**
  *
  */
-class SessionViewStorageFactory<T extends KeyFactory<K,V>, K, V >
+class SessionViewStorageFactory<T extends KeyFactory<K>, K >
 {
-    private KeyFactory<K, V> keyFactory;
+    private KeyFactory<K> keyFactory;
 
-    public SessionViewStorageFactory( KeyFactory<K, V> keyFactory )
+    public SessionViewStorageFactory( KeyFactory<K> keyFactory )
     {
         this.keyFactory = keyFactory;
     }
 
-    public KeyFactory<K, V> getKeyFactory()
+    public KeyFactory<K> getKeyFactory()
     {
         return keyFactory;
     }

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/viewstate/StateCacheFactoryImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/viewstate/StateCacheFactoryImpl.java?rev=1409887&r1=1409854&r2=1409887&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/viewstate/StateCacheFactoryImpl.java
(original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/viewstate/StateCacheFactoryImpl.java
Thu Nov 15 17:17:10 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.renderkit.viewstate;
+package org.apache.myfaces.application.viewstate;
 
 import javax.faces.context.FacesContext;
 

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/viewstate/StateCacheUtils.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/viewstate/StateCacheUtils.java?rev=1409887&r1=1409854&r2=1409887&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/viewstate/StateCacheUtils.java
(original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/viewstate/StateCacheUtils.java
Thu Nov 15 17:17:10 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.renderkit.viewstate;
+package org.apache.myfaces.application.viewstate;
 
 import org.apache.myfaces.renderkit.MyfacesResponseStateManager;
 

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlResponseStateManager.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlResponseStateManager.java?rev=1409887&r1=1409886&r2=1409887&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlResponseStateManager.java
(original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlResponseStateManager.java
Thu Nov 15 17:17:10 2012
@@ -32,7 +32,7 @@ import org.apache.myfaces.application.St
 import org.apache.myfaces.application.StateCacheFactory;
 import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFWebConfigParam;
 import org.apache.myfaces.renderkit.MyfacesResponseStateManager;
-import org.apache.myfaces.renderkit.viewstate.StateCacheFactoryImpl;
+import org.apache.myfaces.application.viewstate.StateCacheFactoryImpl;
 import org.apache.myfaces.shared.config.MyfacesConfig;
 import org.apache.myfaces.shared.renderkit.html.HTML;
 import org.apache.myfaces.shared.renderkit.html.HtmlRendererUtils;

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/jsp/JspViewDeclarationLanguage.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/jsp/JspViewDeclarationLanguage.java?rev=1409887&r1=1409886&r2=1409887&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/jsp/JspViewDeclarationLanguage.java
(original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/jsp/JspViewDeclarationLanguage.java
Thu Nov 15 17:17:10 2012
@@ -35,7 +35,7 @@ import javax.servlet.http.HttpServletRes
 import javax.servlet.jsp.jstl.core.Config;
 
 import org.apache.myfaces.application.jsp.ServletViewResponseWrapper;
-import org.apache.myfaces.renderkit.viewstate.StateCacheUtils;
+import org.apache.myfaces.application.viewstate.StateCacheUtils;
 import org.apache.myfaces.shared.view.JspViewDeclarationLanguageBase;
 import org.apache.myfaces.view.facelets.tag.composite.CompositeLibrary;
 import org.apache.myfaces.view.facelets.tag.jsf.core.CoreLibrary;

Copied: myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/application/viewstate/ClientSideStateCacheTest.java
(from r1409854, myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/renderkit/viewstate/ClientSideStateCacheTest.java)
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/application/viewstate/ClientSideStateCacheTest.java?p2=myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/application/viewstate/ClientSideStateCacheTest.java&p1=myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/renderkit/viewstate/ClientSideStateCacheTest.java&r1=1409854&r2=1409887&rev=1409887&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/renderkit/viewstate/ClientSideStateCacheTest.java
(original)
+++ myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/application/viewstate/ClientSideStateCacheTest.java
Thu Nov 15 17:17:10 2012
@@ -13,11 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.myfaces.renderkit.viewstate;
+package org.apache.myfaces.application.viewstate;
 
 import javax.faces.application.StateManager;
 import org.apache.myfaces.application.StateCache;
-import org.apache.myfaces.renderkit.viewstate.ClientSideStateCacheImpl;
 import org.apache.myfaces.test.base.junit4.AbstractJsfConfigurableMultipleRequestsTestCase;
 import org.junit.Test;
 import org.testng.Assert;

Copied: myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/application/viewstate/ServerSideStateCacheTest.java
(from r1409854, myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/renderkit/viewstate/ServerSideStateCacheTest.java)
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/application/viewstate/ServerSideStateCacheTest.java?p2=myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/application/viewstate/ServerSideStateCacheTest.java&p1=myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/renderkit/viewstate/ServerSideStateCacheTest.java&r1=1409854&r2=1409887&rev=1409887&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/renderkit/viewstate/ServerSideStateCacheTest.java
(original)
+++ myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/application/viewstate/ServerSideStateCacheTest.java
Thu Nov 15 17:17:10 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.renderkit.viewstate;
+package org.apache.myfaces.application.viewstate;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -27,8 +27,6 @@ import javax.faces.application.ProjectSt
 import javax.faces.application.StateManager;
 
 import org.apache.myfaces.application.StateCache;
-import org.apache.myfaces.renderkit.viewstate.ClientSideStateCacheImpl;
-import org.apache.myfaces.renderkit.viewstate.ServerSideStateCacheImpl;
 import org.apache.myfaces.test.base.junit4.AbstractJsfConfigurableMultipleRequestsTestCase;
 import org.junit.Test;
 import org.testng.Assert;

Propchange: myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/application/viewstate/ServerSideStateCacheTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/application/viewstate/ServerSideStateCacheTest.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL



Mime
View raw message