myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tandrasc...@apache.org
Subject [myfaces] branch master updated: break up "shaded"
Date Sun, 02 Dec 2018 20:45:24 GMT
This is an automated email from the ASF dual-hosted git repository.

tandraschko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces.git


The following commit(s) were added to refs/heads/master by this push:
     new 1cb5cdf  break up "shaded"
1cb5cdf is described below

commit 1cb5cdf1473368e62c6ea5a5c2c801e0135615d8
Author: Thomas Andraschko <tandraschko@apache.org>
AuthorDate: Sun Dec 2 21:45:19 2018 +0100

    break up "shaded"
---
 .../java/org/apache/myfaces/application/FacesServletMappingUtils.java | 2 ++
 .../apache/myfaces/{util => application/viewstate}/StateUtils.java    | 2 +-
 .../application/viewstate/token/ClientSideStateTokenProcessor.java    | 2 +-
 .../application/viewstate/token/ServiceSideStateTokenProcessor.java   | 2 +-
 impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java   | 2 +-
 impl/src/main/java/org/apache/myfaces/renderkit/ErrorPageWriter.java  | 2 +-
 .../main/java/org/apache/myfaces/webapp/AbstractFacesInitializer.java | 2 +-
 .../java/org/apache/myfaces/application/StateManagerImplTest.java     | 2 +-
 .../test/java/org/apache/myfaces/renderkit/ErrorPageWriterTest.java   | 2 +-
 .../java/org/apache/myfaces/shared/util/AbstractStateUtilsTest.java   | 4 ++--
 .../org/apache/myfaces/shared/util/CachedStateUtilsAES_CBCTest.java   | 2 +-
 .../apache/myfaces/shared/util/CachedStateUtilsBlowfish_ECBTest.java  | 2 +-
 .../org/apache/myfaces/shared/util/CachedStateUtilsDefaultTest.java   | 2 +-
 .../apache/myfaces/shared/util/CachedStateUtilsTripleDES_ECBTest.java | 2 +-
 .../java/org/apache/myfaces/shared/util/InitVector_CBCTestCase.java   | 2 +-
 .../test/java/org/apache/myfaces/shared/util/SecretKeyCacheTest.java  | 2 +-
 .../org/apache/myfaces/shared/util/SecretKeyConfigurationTest.java    | 2 +-
 .../java/org/apache/myfaces/shared/util/StateUtilsAES_CBCTest.java    | 2 +-
 .../org/apache/myfaces/shared/util/StateUtilsBlowfish_ECBTest.java    | 2 +-
 .../java/org/apache/myfaces/shared/util/StateUtilsDefaultTest.java    | 2 +-
 .../org/apache/myfaces/shared/util/StateUtilsTripleDES_ECBTest.java   | 2 +-
 .../apache/myfaces/view/facelets/StateManagerWithFaceletsTest.java    | 2 +-
 .../myfaces/view/facelets/compiler/UniqueComponentIdTestCase.java     | 2 +-
 23 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/impl/src/main/java/org/apache/myfaces/application/FacesServletMappingUtils.java
b/impl/src/main/java/org/apache/myfaces/application/FacesServletMappingUtils.java
index 622dfc6..197aaba 100644
--- a/impl/src/main/java/org/apache/myfaces/application/FacesServletMappingUtils.java
+++ b/impl/src/main/java/org/apache/myfaces/application/FacesServletMappingUtils.java
@@ -30,6 +30,8 @@ import javax.servlet.ServletRegistration;
 import org.apache.myfaces.util.ClassUtils;
 import org.apache.myfaces.util.ExternalContextUtils;
 import org.apache.myfaces.webapp.webxml.DelegatedFacesServlet;
+import org.apache.myfaces.webapp.webxml.DelegatedFacesServlet;
+import org.apache.myfaces.webapp.webxml.WebXml;
 import org.apache.myfaces.webapp.webxml.WebXml;
 
 public class FacesServletMappingUtils
diff --git a/impl/src/main/java/org/apache/myfaces/util/StateUtils.java b/impl/src/main/java/org/apache/myfaces/application/viewstate/StateUtils.java
similarity index 99%
rename from impl/src/main/java/org/apache/myfaces/util/StateUtils.java
rename to impl/src/main/java/org/apache/myfaces/application/viewstate/StateUtils.java
index 9958095..3be8708 100644
--- a/impl/src/main/java/org/apache/myfaces/util/StateUtils.java
+++ b/impl/src/main/java/org/apache/myfaces/application/viewstate/StateUtils.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.util;
+package org.apache.myfaces.application.viewstate;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
diff --git a/impl/src/main/java/org/apache/myfaces/application/viewstate/token/ClientSideStateTokenProcessor.java
b/impl/src/main/java/org/apache/myfaces/application/viewstate/token/ClientSideStateTokenProcessor.java
index 3e7321f..2f86f3a 100644
--- a/impl/src/main/java/org/apache/myfaces/application/viewstate/token/ClientSideStateTokenProcessor.java
+++ b/impl/src/main/java/org/apache/myfaces/application/viewstate/token/ClientSideStateTokenProcessor.java
@@ -19,7 +19,7 @@
 package org.apache.myfaces.application.viewstate.token;
 
 import javax.faces.context.FacesContext;
-import org.apache.myfaces.util.StateUtils;
+import org.apache.myfaces.application.viewstate.StateUtils;
 
 /**
  *
diff --git a/impl/src/main/java/org/apache/myfaces/application/viewstate/token/ServiceSideStateTokenProcessor.java
b/impl/src/main/java/org/apache/myfaces/application/viewstate/token/ServiceSideStateTokenProcessor.java
index dc1f712..6752fc2 100644
--- a/impl/src/main/java/org/apache/myfaces/application/viewstate/token/ServiceSideStateTokenProcessor.java
+++ b/impl/src/main/java/org/apache/myfaces/application/viewstate/token/ServiceSideStateTokenProcessor.java
@@ -21,7 +21,7 @@ package org.apache.myfaces.application.viewstate.token;
 import java.io.UnsupportedEncodingException;
 import javax.faces.FacesException;
 import javax.faces.context.FacesContext;
-import org.apache.myfaces.util.StateUtils;
+import org.apache.myfaces.application.viewstate.StateUtils;
 
 /**
  *
diff --git a/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java b/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java
index 524b0d3..de5d76d 100755
--- a/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java
+++ b/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java
@@ -120,7 +120,7 @@ import org.apache.myfaces.renderkit.html.HtmlRenderKitImpl;
 import org.apache.myfaces.resource.ResourceLoaderUtils;
 import org.apache.myfaces.util.ClassUtils;
 import org.apache.myfaces.util.LocaleUtils;
-import org.apache.myfaces.util.StateUtils;
+import org.apache.myfaces.application.viewstate.StateUtils;
 import org.apache.myfaces.util.StringUtils;
 import org.apache.myfaces.util.WebConfigParamUtils;
 import org.apache.myfaces.cdi.util.BeanEntry;
diff --git a/impl/src/main/java/org/apache/myfaces/renderkit/ErrorPageWriter.java b/impl/src/main/java/org/apache/myfaces/renderkit/ErrorPageWriter.java
index 23ae3f3..e0dad9e 100644
--- a/impl/src/main/java/org/apache/myfaces/renderkit/ErrorPageWriter.java
+++ b/impl/src/main/java/org/apache/myfaces/renderkit/ErrorPageWriter.java
@@ -68,7 +68,7 @@ import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFWebConf
 import org.apache.myfaces.lifecycle.ViewNotFoundException;
 import org.apache.myfaces.config.MyfacesConfig;
 import org.apache.myfaces.util.ClassUtils;
-import org.apache.myfaces.util.StateUtils;
+import org.apache.myfaces.application.viewstate.StateUtils;
 import org.apache.myfaces.view.facelets.component.UIRepeat;
 import org.apache.myfaces.view.facelets.el.ContextAware;
 
diff --git a/impl/src/main/java/org/apache/myfaces/webapp/AbstractFacesInitializer.java b/impl/src/main/java/org/apache/myfaces/webapp/AbstractFacesInitializer.java
index cd70c03..bedb2f8 100644
--- a/impl/src/main/java/org/apache/myfaces/webapp/AbstractFacesInitializer.java
+++ b/impl/src/main/java/org/apache/myfaces/webapp/AbstractFacesInitializer.java
@@ -26,7 +26,7 @@ import org.apache.myfaces.context.servlet.StartupFacesContextImpl;
 import org.apache.myfaces.context.servlet.StartupServletExternalContextImpl;
 import org.apache.myfaces.application.FacesServletMappingUtils;
 import org.apache.myfaces.context.ExceptionHandlerImpl;
-import org.apache.myfaces.util.StateUtils;
+import org.apache.myfaces.application.viewstate.StateUtils;
 import org.apache.myfaces.util.WebConfigParamUtils;
 import org.apache.myfaces.cdi.util.BeanEntry;
 import org.apache.myfaces.spi.InjectionProvider;
diff --git a/impl/src/test/java/org/apache/myfaces/application/StateManagerImplTest.java b/impl/src/test/java/org/apache/myfaces/application/StateManagerImplTest.java
index 27d1d22..315112e 100644
--- a/impl/src/test/java/org/apache/myfaces/application/StateManagerImplTest.java
+++ b/impl/src/test/java/org/apache/myfaces/application/StateManagerImplTest.java
@@ -28,7 +28,7 @@ import javax.faces.render.RenderKitFactory;
 import javax.faces.render.ResponseStateManager;
 
 import org.apache.myfaces.renderkit.html.HtmlResponseStateManager;
-import org.apache.myfaces.util.StateUtils;
+import org.apache.myfaces.application.viewstate.StateUtils;
 import org.apache.myfaces.util.serial.DefaultSerialFactory;
 import org.apache.myfaces.test.base.junit4.AbstractJsfConfigurableMultipleRequestsTestCase;
 import org.apache.myfaces.test.mock.MockRenderKit;
diff --git a/impl/src/test/java/org/apache/myfaces/renderkit/ErrorPageWriterTest.java b/impl/src/test/java/org/apache/myfaces/renderkit/ErrorPageWriterTest.java
index bb25e34..f373d85 100644
--- a/impl/src/test/java/org/apache/myfaces/renderkit/ErrorPageWriterTest.java
+++ b/impl/src/test/java/org/apache/myfaces/renderkit/ErrorPageWriterTest.java
@@ -29,7 +29,7 @@ import junit.framework.Test;
 import junit.framework.TestSuite;
 
 import org.apache.myfaces.renderkit.html.HtmlTextRenderer;
-import org.apache.myfaces.util.StateUtils;
+import org.apache.myfaces.application.viewstate.StateUtils;
 import org.apache.myfaces.util.serial.DefaultSerialFactory;
 import org.apache.myfaces.test.base.AbstractJsfTestCase;
 import org.apache.myfaces.test.mock.MockRenderKitFactory;
diff --git a/impl/src/test/java/org/apache/myfaces/shared/util/AbstractStateUtilsTest.java
b/impl/src/test/java/org/apache/myfaces/shared/util/AbstractStateUtilsTest.java
index 45ac169..6442195 100644
--- a/impl/src/test/java/org/apache/myfaces/shared/util/AbstractStateUtilsTest.java
+++ b/impl/src/test/java/org/apache/myfaces/shared/util/AbstractStateUtilsTest.java
@@ -20,7 +20,7 @@ package org.apache.myfaces.shared.util;
  * Running this TestCase directly will blow up.
  */
 
-import org.apache.myfaces.util.StateUtils;
+import org.apache.myfaces.application.viewstate.StateUtils;
 import org.apache.myfaces.util.serial.DefaultSerialFactory;
 import org.apache.myfaces.test.base.AbstractJsfTestCase;
 
@@ -77,7 +77,7 @@ public abstract class AbstractStateUtilsTest extends AbstractJsfTestCase
impleme
     public void testConstruction()
     {
         String constructed = StateUtils.construct(TEST_DATA, externalContext);
-        Object object = org.apache.myfaces.util.StateUtils.reconstruct(constructed, externalContext);
+        Object object = org.apache.myfaces.application.viewstate.StateUtils.reconstruct(constructed,
externalContext);
         assertTrue(TEST_DATA.equals(object));
     }
 
diff --git a/impl/src/test/java/org/apache/myfaces/shared/util/CachedStateUtilsAES_CBCTest.java
b/impl/src/test/java/org/apache/myfaces/shared/util/CachedStateUtilsAES_CBCTest.java
index ea5414c..2244047 100644
--- a/impl/src/test/java/org/apache/myfaces/shared/util/CachedStateUtilsAES_CBCTest.java
+++ b/impl/src/test/java/org/apache/myfaces/shared/util/CachedStateUtilsAES_CBCTest.java
@@ -20,7 +20,7 @@
 
 package org.apache.myfaces.shared.util;
 
-import org.apache.myfaces.util.StateUtils;
+import org.apache.myfaces.application.viewstate.StateUtils;
 
 /**
  * <p>This TestCase uses the Advanced Encryption Standard with
diff --git a/impl/src/test/java/org/apache/myfaces/shared/util/CachedStateUtilsBlowfish_ECBTest.java
b/impl/src/test/java/org/apache/myfaces/shared/util/CachedStateUtilsBlowfish_ECBTest.java
index 47143fa..b44d0c9 100644
--- a/impl/src/test/java/org/apache/myfaces/shared/util/CachedStateUtilsBlowfish_ECBTest.java
+++ b/impl/src/test/java/org/apache/myfaces/shared/util/CachedStateUtilsBlowfish_ECBTest.java
@@ -20,7 +20,7 @@
 
 package org.apache.myfaces.shared.util;
 
-import org.apache.myfaces.util.StateUtils;
+import org.apache.myfaces.application.viewstate.StateUtils;
 
 public class CachedStateUtilsBlowfish_ECBTest extends AbstractStateUtilsTest
 {
diff --git a/impl/src/test/java/org/apache/myfaces/shared/util/CachedStateUtilsDefaultTest.java
b/impl/src/test/java/org/apache/myfaces/shared/util/CachedStateUtilsDefaultTest.java
index d073925..ee8c020 100644
--- a/impl/src/test/java/org/apache/myfaces/shared/util/CachedStateUtilsDefaultTest.java
+++ b/impl/src/test/java/org/apache/myfaces/shared/util/CachedStateUtilsDefaultTest.java
@@ -20,7 +20,7 @@
 
 package org.apache.myfaces.shared.util;
 
-import org.apache.myfaces.util.StateUtils;
+import org.apache.myfaces.application.viewstate.StateUtils;
 
 public class CachedStateUtilsDefaultTest extends AbstractStateUtilsTest
 {
diff --git a/impl/src/test/java/org/apache/myfaces/shared/util/CachedStateUtilsTripleDES_ECBTest.java
b/impl/src/test/java/org/apache/myfaces/shared/util/CachedStateUtilsTripleDES_ECBTest.java
index 5426dd3..4a60e26 100644
--- a/impl/src/test/java/org/apache/myfaces/shared/util/CachedStateUtilsTripleDES_ECBTest.java
+++ b/impl/src/test/java/org/apache/myfaces/shared/util/CachedStateUtilsTripleDES_ECBTest.java
@@ -20,7 +20,7 @@
 
 package org.apache.myfaces.shared.util;
 
-import org.apache.myfaces.util.StateUtils;
+import org.apache.myfaces.application.viewstate.StateUtils;
 
 public class CachedStateUtilsTripleDES_ECBTest extends AbstractStateUtilsTest
 {
diff --git a/impl/src/test/java/org/apache/myfaces/shared/util/InitVector_CBCTestCase.java
b/impl/src/test/java/org/apache/myfaces/shared/util/InitVector_CBCTestCase.java
index 390176b..a86fccc 100644
--- a/impl/src/test/java/org/apache/myfaces/shared/util/InitVector_CBCTestCase.java
+++ b/impl/src/test/java/org/apache/myfaces/shared/util/InitVector_CBCTestCase.java
@@ -17,7 +17,7 @@
 
 package org.apache.myfaces.shared.util;
 
-import org.apache.myfaces.util.StateUtils;
+import org.apache.myfaces.application.viewstate.StateUtils;
 import org.apache.myfaces.test.base.AbstractJsfTestCase;
 
 import javax.faces.FacesException;
diff --git a/impl/src/test/java/org/apache/myfaces/shared/util/SecretKeyCacheTest.java b/impl/src/test/java/org/apache/myfaces/shared/util/SecretKeyCacheTest.java
index 5cd7753..3df8fde 100644
--- a/impl/src/test/java/org/apache/myfaces/shared/util/SecretKeyCacheTest.java
+++ b/impl/src/test/java/org/apache/myfaces/shared/util/SecretKeyCacheTest.java
@@ -17,7 +17,7 @@
 
 package org.apache.myfaces.shared.util;
 
-import org.apache.myfaces.util.StateUtils;
+import org.apache.myfaces.application.viewstate.StateUtils;
 import org.apache.myfaces.test.base.AbstractJsfTestCase;
 
 import javax.crypto.SecretKey;
diff --git a/impl/src/test/java/org/apache/myfaces/shared/util/SecretKeyConfigurationTest.java
b/impl/src/test/java/org/apache/myfaces/shared/util/SecretKeyConfigurationTest.java
index cfdd9bd..bfffecd 100644
--- a/impl/src/test/java/org/apache/myfaces/shared/util/SecretKeyConfigurationTest.java
+++ b/impl/src/test/java/org/apache/myfaces/shared/util/SecretKeyConfigurationTest.java
@@ -17,7 +17,7 @@
 
 package org.apache.myfaces.shared.util;
 
-import org.apache.myfaces.util.StateUtils;
+import org.apache.myfaces.application.viewstate.StateUtils;
 import org.apache.myfaces.test.base.AbstractJsfTestCase;
 
 public class SecretKeyConfigurationTest extends AbstractJsfTestCase
diff --git a/impl/src/test/java/org/apache/myfaces/shared/util/StateUtilsAES_CBCTest.java
b/impl/src/test/java/org/apache/myfaces/shared/util/StateUtilsAES_CBCTest.java
index f6797e0..963c43d 100644
--- a/impl/src/test/java/org/apache/myfaces/shared/util/StateUtilsAES_CBCTest.java
+++ b/impl/src/test/java/org/apache/myfaces/shared/util/StateUtilsAES_CBCTest.java
@@ -15,7 +15,7 @@
  */
 package org.apache.myfaces.shared.util;
 
-import org.apache.myfaces.util.StateUtils;
+import org.apache.myfaces.application.viewstate.StateUtils;
 
 /**
  * <p>This TestCase uses the Advanced Encryption Standard with
diff --git a/impl/src/test/java/org/apache/myfaces/shared/util/StateUtilsBlowfish_ECBTest.java
b/impl/src/test/java/org/apache/myfaces/shared/util/StateUtilsBlowfish_ECBTest.java
index 3715fdf..6d181ef 100644
--- a/impl/src/test/java/org/apache/myfaces/shared/util/StateUtilsBlowfish_ECBTest.java
+++ b/impl/src/test/java/org/apache/myfaces/shared/util/StateUtilsBlowfish_ECBTest.java
@@ -15,7 +15,7 @@
  */
 package org.apache.myfaces.shared.util;
 
-import org.apache.myfaces.util.StateUtils;
+import org.apache.myfaces.application.viewstate.StateUtils;
 
 /**
  * This TestCase uses Blowfish in Electronic CodeBook mode
diff --git a/impl/src/test/java/org/apache/myfaces/shared/util/StateUtilsDefaultTest.java
b/impl/src/test/java/org/apache/myfaces/shared/util/StateUtilsDefaultTest.java
index 4ee0718..932e6e6 100644
--- a/impl/src/test/java/org/apache/myfaces/shared/util/StateUtilsDefaultTest.java
+++ b/impl/src/test/java/org/apache/myfaces/shared/util/StateUtilsDefaultTest.java
@@ -15,7 +15,7 @@
  */
 package org.apache.myfaces.shared.util;
 
-import org.apache.myfaces.util.StateUtils;
+import org.apache.myfaces.application.viewstate.StateUtils;
 
 /**
  * This TestCase uses the the default algorithm/mode/padding of
diff --git a/impl/src/test/java/org/apache/myfaces/shared/util/StateUtilsTripleDES_ECBTest.java
b/impl/src/test/java/org/apache/myfaces/shared/util/StateUtilsTripleDES_ECBTest.java
index 3bd24fb..8f75007 100644
--- a/impl/src/test/java/org/apache/myfaces/shared/util/StateUtilsTripleDES_ECBTest.java
+++ b/impl/src/test/java/org/apache/myfaces/shared/util/StateUtilsTripleDES_ECBTest.java
@@ -15,7 +15,7 @@
  */
 package org.apache.myfaces.shared.util;
 
-import org.apache.myfaces.util.StateUtils;
+import org.apache.myfaces.application.viewstate.StateUtils;
 
 /**
  * This TestCase uses the 3DES algorithm in Electronic CodeBook mode
diff --git a/impl/src/test/java/org/apache/myfaces/view/facelets/StateManagerWithFaceletsTest.java
b/impl/src/test/java/org/apache/myfaces/view/facelets/StateManagerWithFaceletsTest.java
index 08fdb29..5f9a14f 100644
--- a/impl/src/test/java/org/apache/myfaces/view/facelets/StateManagerWithFaceletsTest.java
+++ b/impl/src/test/java/org/apache/myfaces/view/facelets/StateManagerWithFaceletsTest.java
@@ -25,7 +25,7 @@ import javax.faces.render.ResponseStateManager;
 
 import org.apache.myfaces.application.StateManagerImpl;
 import org.apache.myfaces.renderkit.html.HtmlResponseStateManager;
-import org.apache.myfaces.util.StateUtils;
+import org.apache.myfaces.application.viewstate.StateUtils;
 import org.apache.myfaces.util.serial.DefaultSerialFactory;
 import org.apache.myfaces.test.mock.MockFacesContext20;
 import org.apache.myfaces.test.mock.MockRenderKit;
diff --git a/impl/src/test/java/org/apache/myfaces/view/facelets/compiler/UniqueComponentIdTestCase.java
b/impl/src/test/java/org/apache/myfaces/view/facelets/compiler/UniqueComponentIdTestCase.java
index eac0c8b..6bfb348 100644
--- a/impl/src/test/java/org/apache/myfaces/view/facelets/compiler/UniqueComponentIdTestCase.java
+++ b/impl/src/test/java/org/apache/myfaces/view/facelets/compiler/UniqueComponentIdTestCase.java
@@ -33,7 +33,7 @@ import javax.faces.render.ResponseStateManager;
 import org.apache.myfaces.application.StateManagerImpl;
 import org.apache.myfaces.renderkit.html.HtmlResponseStateManager;
 import org.apache.myfaces.config.MyfacesConfig;
-import org.apache.myfaces.util.StateUtils;
+import org.apache.myfaces.application.viewstate.StateUtils;
 import org.apache.myfaces.util.serial.DefaultSerialFactory;
 import org.apache.myfaces.test.mock.MockFacesContext20;
 import org.apache.myfaces.test.mock.MockRenderKit;


Mime
View raw message