myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject [myfaces-test] 19/21: MYFACES-2422 Change package name to org.apache.myfaces.test in myfaces-test project
Date Thu, 03 May 2018 18:26:06 GMT
This is an automated email from the ASF dual-hosted git repository.

deki pushed a commit to branch 1_0_0_alpha
in repository https://gitbox.apache.org/repos/asf/myfaces-test.git

commit 774b61aa6175ff84200638d2f5fdc5fd67758921
Author: Leonardo Uribe <lu4242@apache.org>
AuthorDate: Tue Nov 24 22:31:13 2009 +0000

    MYFACES-2422 Change package name to org.apache.myfaces.test in myfaces-test project
---
 .../test/base/AbstractJsfTestCase.java             | 34 +++++++++++-----------
 .../test/base/AbstractViewControllerTestCase.java  |  2 +-
 .../test/cargo/CargoTestSetup.java                 |  2 +-
 .../test/config/ConfigParser.java                  |  6 ++--
 .../{shale => myfaces}/test/config/package.html    |  0
 .../test/el/AbstractELResolver.java                |  2 +-
 .../test/el/FacesImplicitObjectELResolver.java     |  2 +-
 .../test/el/FacesPropertyResolverChainWrapper.java |  2 +-
 .../test/el/FacesResourceBundleELResolver.java     |  4 +--
 .../test/el/FacesScopedAttributeELResolver.java    |  2 +-
 .../test/el/FacesVariableResolverChainWrapper.java |  2 +-
 .../{shale => myfaces}/test/el/MockELContext.java  |  2 +-
 .../test/el/MockExpressionFactory.java             |  2 +-
 .../test/el/MockFunctionMapper.java                |  2 +-
 .../test/el/MockMethodExpression.java              |  2 +-
 .../test/el/MockValueExpression.java               |  2 +-
 .../test/el/MockVariableMapper.java                |  2 +-
 .../test/el/MockVariableValueExpression.java       |  2 +-
 .../apache/{shale => myfaces}/test/el/package.html |  0
 .../test/htmlunit/AbstractHtmlUnitTestCase.java    |  2 +-
 .../test/jmock/AbstractJmockJsfTestCase.java       | 34 +++++++++++-----------
 .../test/mock/MockActionListener.java              |  2 +-
 .../test/mock/MockApplication.java                 |  2 +-
 .../test/mock/MockApplication12.java               | 15 +++++-----
 .../test/mock/MockApplicationFactory.java          |  6 ++--
 .../test/mock/MockApplicationMap.java              |  2 +-
 .../test/mock/MockEnumeration.java                 |  2 +-
 .../test/mock/MockExternalContext.java             |  2 +-
 .../test/mock/MockExternalContext12.java           |  2 +-
 .../test/mock/MockFacesContext.java                |  2 +-
 .../test/mock/MockFacesContext12.java              |  5 ++--
 .../test/mock/MockFacesContextFactory.java         |  8 ++---
 .../test/mock/MockHttpServletRequest.java          |  4 +--
 .../test/mock/MockHttpServletResponse.java         |  2 +-
 .../test/mock/MockHttpSession.java                 |  2 +-
 .../test/mock/MockMethodBinding.java               |  2 +-
 .../test/mock/MockNavigationHandler.java           |  2 +-
 .../test/mock/MockPortletContext.java              |  2 +-
 .../test/mock/MockPortletRequest.java              |  2 +-
 .../test/mock/MockPortletResponse.java             |  2 +-
 .../test/mock/MockPortletSession.java              |  2 +-
 .../test/mock/MockPrincipal.java                   |  2 +-
 .../test/mock/MockPrintWriter.java                 |  2 +-
 .../test/mock/MockPropertyResolver.java            |  2 +-
 .../test/mock/MockRenderKit.java                   |  2 +-
 .../test/mock/MockRenderKitFactory.java            |  2 +-
 .../test/mock/MockRequestMap.java                  |  2 +-
 .../test/mock/MockResponseWriter.java              |  2 +-
 .../{shale => myfaces}/test/mock/MockServlet.java  |  2 +-
 .../test/mock/MockServletConfig.java               |  2 +-
 .../test/mock/MockServletContext.java              |  2 +-
 .../test/mock/MockServletOutputStream.java         |  2 +-
 .../test/mock/MockSessionMap.java                  |  2 +-
 .../test/mock/MockStateManager.java                |  2 +-
 .../test/mock/MockValueBinding.java                |  2 +-
 .../test/mock/MockVariableResolver.java            |  2 +-
 .../test/mock/MockViewHandler.java                 |  2 +-
 .../mock/lifecycle/ApplyRequestValuesExecutor.java |  2 +-
 .../mock/lifecycle/DefaultRestoreViewSupport.java  |  2 +-
 .../mock/lifecycle/InvokeApplicationExecutor.java  |  2 +-
 .../test/mock/lifecycle/MockLifecycle.java         |  2 +-
 .../test/mock/lifecycle/MockLifecycleFactory.java  |  2 +-
 .../test/mock/lifecycle/PhaseExecutor.java         |  2 +-
 .../test/mock/lifecycle/PhaseListenerManager.java  |  2 +-
 .../mock/lifecycle/ProcessValidationsExecutor.java |  2 +-
 .../mock/lifecycle/RenderResponseExecutor.java     |  2 +-
 .../test/mock/lifecycle/RestoreViewExecutor.java   |  2 +-
 .../test/mock/lifecycle/RestoreViewSupport.java    |  2 +-
 .../mock/lifecycle/UpdateModelValuesExecutor.java  |  2 +-
 .../test/config/ConfigParserTestCase.java          |  8 +++--
 .../test/config/MyConverter.java                   |  2 +-
 .../{shale => myfaces}/test/config/MyRenderer.java |  2 +-
 .../test/el/MockExpressionFactoryTestCase.java     |  8 +++--
 .../test/mock/MockObjectsTestCase.java             |  4 +--
 .../{shale => myfaces}/test/mock/TestMockBean.java |  2 +-
 .../test/mock/ValueBindingTest.java                |  6 ++--
 .../{shale => myfaces}/test/mock/data/Bean.java    |  2 +-
 .../test/config/faces-config-1.xml                 |  6 ++--
 .../test/mock/MockApplication20.java               |  2 +-
 .../test/mock/MockApplicationFactory.java          |  8 ++---
 .../test/mock/MockExternalContext20.java           |  2 +-
 .../test/mock/MockFacesContext20.java              |  2 +-
 .../test/mock/MockFacesContextFactory.java         | 12 ++++----
 83 files changed, 152 insertions(+), 146 deletions(-)

diff --git a/test12/src/main/java/org/apache/shale/test/base/AbstractJsfTestCase.java b/test12/src/main/java/org/apache/myfaces/test/base/AbstractJsfTestCase.java
similarity index 88%
rename from test12/src/main/java/org/apache/shale/test/base/AbstractJsfTestCase.java
rename to test12/src/main/java/org/apache/myfaces/test/base/AbstractJsfTestCase.java
index 8f45cc7..609a57b 100644
--- a/test12/src/main/java/org/apache/shale/test/base/AbstractJsfTestCase.java
+++ b/test12/src/main/java/org/apache/myfaces/test/base/AbstractJsfTestCase.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shale.test.base;
+package org.apache.myfaces.test.base;
 
 import java.net.URL;
 import java.net.URLClassLoader;
@@ -28,18 +28,18 @@ import javax.faces.render.RenderKitFactory;
 
 import junit.framework.TestCase;
 
-import org.apache.shale.test.mock.MockApplication;
-import org.apache.shale.test.mock.MockExternalContext;
-import org.apache.shale.test.mock.MockFacesContext;
-import org.apache.shale.test.mock.MockFacesContextFactory;
-import org.apache.shale.test.mock.MockHttpServletRequest;
-import org.apache.shale.test.mock.MockHttpServletResponse;
-import org.apache.shale.test.mock.MockHttpSession;
-import org.apache.shale.test.mock.MockRenderKit;
-import org.apache.shale.test.mock.MockServletConfig;
-import org.apache.shale.test.mock.MockServletContext;
-import org.apache.shale.test.mock.lifecycle.MockLifecycle;
-import org.apache.shale.test.mock.lifecycle.MockLifecycleFactory;
+import org.apache.myfaces.test.mock.MockApplication;
+import org.apache.myfaces.test.mock.MockExternalContext;
+import org.apache.myfaces.test.mock.MockFacesContext;
+import org.apache.myfaces.test.mock.MockFacesContextFactory;
+import org.apache.myfaces.test.mock.MockHttpServletRequest;
+import org.apache.myfaces.test.mock.MockHttpServletResponse;
+import org.apache.myfaces.test.mock.MockHttpSession;
+import org.apache.myfaces.test.mock.MockRenderKit;
+import org.apache.myfaces.test.mock.MockServletConfig;
+import org.apache.myfaces.test.mock.MockServletContext;
+import org.apache.myfaces.test.mock.lifecycle.MockLifecycle;
+import org.apache.myfaces.test.mock.lifecycle.MockLifecycleFactory;
 
 /**
  * <p>Abstract JUnit test case base class, which sets up the JavaServer Faces
@@ -112,13 +112,13 @@ public abstract class AbstractJsfTestCase extends TestCase {
         // Set up JSF API Objects
         FactoryFinder.releaseFactories();
         FactoryFinder.setFactory(FactoryFinder.APPLICATION_FACTORY,
-        "org.apache.shale.test.mock.MockApplicationFactory");
+        "org.apache.myfaces.test.mock.MockApplicationFactory");
         FactoryFinder.setFactory(FactoryFinder.FACES_CONTEXT_FACTORY,
-        "org.apache.shale.test.mock.MockFacesContextFactory");
+        "org.apache.myfaces.test.mock.MockFacesContextFactory");
         FactoryFinder.setFactory(FactoryFinder.LIFECYCLE_FACTORY,
-        "org.apache.shale.test.mock.lifecycle.MockLifecycleFactory");
+        "org.apache.myfaces.test.mock.lifecycle.MockLifecycleFactory");
         FactoryFinder.setFactory(FactoryFinder.RENDER_KIT_FACTORY,
-        "org.apache.shale.test.mock.MockRenderKitFactory");
+        "org.apache.myfaces.test.mock.MockRenderKitFactory");
 
         externalContext =
             new MockExternalContext(servletContext, request, response);
diff --git a/test12/src/main/java/org/apache/shale/test/base/AbstractViewControllerTestCase.java b/test12/src/main/java/org/apache/myfaces/test/base/AbstractViewControllerTestCase.java
similarity index 98%
rename from test12/src/main/java/org/apache/shale/test/base/AbstractViewControllerTestCase.java
rename to test12/src/main/java/org/apache/myfaces/test/base/AbstractViewControllerTestCase.java
index 57a93d6..2111287 100644
--- a/test12/src/main/java/org/apache/shale/test/base/AbstractViewControllerTestCase.java
+++ b/test12/src/main/java/org/apache/myfaces/test/base/AbstractViewControllerTestCase.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shale.test.base;
+package org.apache.myfaces.test.base;
 
 import java.util.Iterator;
 
diff --git a/test12/src/main/java/org/apache/shale/test/cargo/CargoTestSetup.java b/test12/src/main/java/org/apache/myfaces/test/cargo/CargoTestSetup.java
similarity index 99%
rename from test12/src/main/java/org/apache/shale/test/cargo/CargoTestSetup.java
rename to test12/src/main/java/org/apache/myfaces/test/cargo/CargoTestSetup.java
index 42d42b9..44d99a3 100644
--- a/test12/src/main/java/org/apache/shale/test/cargo/CargoTestSetup.java
+++ b/test12/src/main/java/org/apache/myfaces/test/cargo/CargoTestSetup.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shale.test.cargo;
+package org.apache.myfaces.test.cargo;
 
 import java.io.File;
 
diff --git a/test12/src/main/java/org/apache/shale/test/config/ConfigParser.java b/test12/src/main/java/org/apache/myfaces/test/config/ConfigParser.java
similarity index 99%
rename from test12/src/main/java/org/apache/shale/test/config/ConfigParser.java
rename to test12/src/main/java/org/apache/myfaces/test/config/ConfigParser.java
index a06a02e..a6a201f 100644
--- a/test12/src/main/java/org/apache/shale/test/config/ConfigParser.java
+++ b/test12/src/main/java/org/apache/myfaces/test/config/ConfigParser.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shale.test.config;
+package org.apache.myfaces.test.config;
 
 import java.io.IOException;
 import java.net.URL;
@@ -27,7 +27,7 @@ import javax.faces.render.RenderKitFactory;
 import javax.faces.render.Renderer;
 import org.apache.commons.digester.Digester;
 import org.apache.commons.digester.Rule;
-import org.apache.shale.test.mock.MockRenderKit;
+import org.apache.myfaces.test.mock.MockRenderKit;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 
@@ -45,7 +45,7 @@ import org.xml.sax.SAXException;
  *
  * <p>Note that any declared <em>factory</em> instances are explicitly
  * <strong>NOT</strong> registered, allowing the mock object hierarchy
- * of the Shale Test Framework to manage these APIs.</p>
+ * of the Myfaces Test Framework to manage these APIs.</p>
  *
  * <p><strong>USAGE NOTE</strong> - If you are using an instance of this
  * class within a subclass of <code>AbstractJsfTestCase</code> or
diff --git a/test12/src/main/java/org/apache/shale/test/config/package.html b/test12/src/main/java/org/apache/myfaces/test/config/package.html
similarity index 100%
rename from test12/src/main/java/org/apache/shale/test/config/package.html
rename to test12/src/main/java/org/apache/myfaces/test/config/package.html
diff --git a/test12/src/main/java/org/apache/shale/test/el/AbstractELResolver.java b/test12/src/main/java/org/apache/myfaces/test/el/AbstractELResolver.java
similarity index 98%
rename from test12/src/main/java/org/apache/shale/test/el/AbstractELResolver.java
rename to test12/src/main/java/org/apache/myfaces/test/el/AbstractELResolver.java
index c3c9df2..6afc166 100644
--- a/test12/src/main/java/org/apache/shale/test/el/AbstractELResolver.java
+++ b/test12/src/main/java/org/apache/myfaces/test/el/AbstractELResolver.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shale.test.el;
+package org.apache.myfaces.test.el;
 
 import java.beans.FeatureDescriptor;
 import javax.el.ELResolver;
diff --git a/test12/src/main/java/org/apache/shale/test/el/FacesImplicitObjectELResolver.java b/test12/src/main/java/org/apache/myfaces/test/el/FacesImplicitObjectELResolver.java
similarity index 99%
rename from test12/src/main/java/org/apache/shale/test/el/FacesImplicitObjectELResolver.java
rename to test12/src/main/java/org/apache/myfaces/test/el/FacesImplicitObjectELResolver.java
index f79c989..c9c3965 100644
--- a/test12/src/main/java/org/apache/shale/test/el/FacesImplicitObjectELResolver.java
+++ b/test12/src/main/java/org/apache/myfaces/test/el/FacesImplicitObjectELResolver.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shale.test.el;
+package org.apache.myfaces.test.el;
 
 import java.util.ArrayList;
 import java.util.Iterator;
diff --git a/test12/src/main/java/org/apache/shale/test/el/FacesPropertyResolverChainWrapper.java b/test12/src/main/java/org/apache/myfaces/test/el/FacesPropertyResolverChainWrapper.java
similarity index 99%
rename from test12/src/main/java/org/apache/shale/test/el/FacesPropertyResolverChainWrapper.java
rename to test12/src/main/java/org/apache/myfaces/test/el/FacesPropertyResolverChainWrapper.java
index 27ff077..38a420b 100644
--- a/test12/src/main/java/org/apache/shale/test/el/FacesPropertyResolverChainWrapper.java
+++ b/test12/src/main/java/org/apache/myfaces/test/el/FacesPropertyResolverChainWrapper.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shale.test.el;
+package org.apache.myfaces.test.el;
 
 import java.util.Iterator;
 import java.util.List;
diff --git a/test12/src/main/java/org/apache/shale/test/el/FacesResourceBundleELResolver.java b/test12/src/main/java/org/apache/myfaces/test/el/FacesResourceBundleELResolver.java
similarity index 98%
rename from test12/src/main/java/org/apache/shale/test/el/FacesResourceBundleELResolver.java
rename to test12/src/main/java/org/apache/myfaces/test/el/FacesResourceBundleELResolver.java
index 7af0302..8d3c829 100644
--- a/test12/src/main/java/org/apache/shale/test/el/FacesResourceBundleELResolver.java
+++ b/test12/src/main/java/org/apache/myfaces/test/el/FacesResourceBundleELResolver.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shale.test.el;
+package org.apache.myfaces.test.el;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -28,7 +28,7 @@ import javax.el.PropertyNotFoundException;
 import javax.el.PropertyNotWritableException;
 import javax.faces.context.FacesContext;
 
-import org.apache.shale.test.mock.MockApplication12;
+import org.apache.myfaces.test.mock.MockApplication12;
 
 /**
  * <p><code>ELResolver</code> implementation that accesses resource bundles
diff --git a/test12/src/main/java/org/apache/shale/test/el/FacesScopedAttributeELResolver.java b/test12/src/main/java/org/apache/myfaces/test/el/FacesScopedAttributeELResolver.java
similarity index 99%
rename from test12/src/main/java/org/apache/shale/test/el/FacesScopedAttributeELResolver.java
rename to test12/src/main/java/org/apache/myfaces/test/el/FacesScopedAttributeELResolver.java
index a9a5e23..ad350a6 100644
--- a/test12/src/main/java/org/apache/shale/test/el/FacesScopedAttributeELResolver.java
+++ b/test12/src/main/java/org/apache/myfaces/test/el/FacesScopedAttributeELResolver.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shale.test.el;
+package org.apache.myfaces.test.el;
 
 import java.util.ArrayList;
 import java.util.Iterator;
diff --git a/test12/src/main/java/org/apache/shale/test/el/FacesVariableResolverChainWrapper.java b/test12/src/main/java/org/apache/myfaces/test/el/FacesVariableResolverChainWrapper.java
similarity index 96%
rename from test12/src/main/java/org/apache/shale/test/el/FacesVariableResolverChainWrapper.java
rename to test12/src/main/java/org/apache/myfaces/test/el/FacesVariableResolverChainWrapper.java
index aa22068..64779d2 100644
--- a/test12/src/main/java/org/apache/shale/test/el/FacesVariableResolverChainWrapper.java
+++ b/test12/src/main/java/org/apache/myfaces/test/el/FacesVariableResolverChainWrapper.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shale.test.el;
+package org.apache.myfaces.test.el;
 
 import java.util.Iterator;
 
diff --git a/test12/src/main/java/org/apache/shale/test/el/MockELContext.java b/test12/src/main/java/org/apache/myfaces/test/el/MockELContext.java
similarity index 98%
rename from test12/src/main/java/org/apache/shale/test/el/MockELContext.java
rename to test12/src/main/java/org/apache/myfaces/test/el/MockELContext.java
index 237499d..5969594 100644
--- a/test12/src/main/java/org/apache/shale/test/el/MockELContext.java
+++ b/test12/src/main/java/org/apache/myfaces/test/el/MockELContext.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shale.test.el;
+package org.apache.myfaces.test.el;
 
 import java.util.HashMap;
 import java.util.Locale;
diff --git a/test12/src/main/java/org/apache/shale/test/el/MockExpressionFactory.java b/test12/src/main/java/org/apache/myfaces/test/el/MockExpressionFactory.java
similarity index 99%
rename from test12/src/main/java/org/apache/shale/test/el/MockExpressionFactory.java
rename to test12/src/main/java/org/apache/myfaces/test/el/MockExpressionFactory.java
index e973008..a86d7b3 100644
--- a/test12/src/main/java/org/apache/shale/test/el/MockExpressionFactory.java
+++ b/test12/src/main/java/org/apache/myfaces/test/el/MockExpressionFactory.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shale.test.el;
+package org.apache.myfaces.test.el;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
diff --git a/test12/src/main/java/org/apache/shale/test/el/MockFunctionMapper.java b/test12/src/main/java/org/apache/myfaces/test/el/MockFunctionMapper.java
similarity index 98%
rename from test12/src/main/java/org/apache/shale/test/el/MockFunctionMapper.java
rename to test12/src/main/java/org/apache/myfaces/test/el/MockFunctionMapper.java
index 1bed5a2..089d191 100644
--- a/test12/src/main/java/org/apache/shale/test/el/MockFunctionMapper.java
+++ b/test12/src/main/java/org/apache/myfaces/test/el/MockFunctionMapper.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shale.test.el;
+package org.apache.myfaces.test.el;
 
 import java.lang.reflect.Method;
 import java.util.HashMap;
diff --git a/test12/src/main/java/org/apache/shale/test/el/MockMethodExpression.java b/test12/src/main/java/org/apache/myfaces/test/el/MockMethodExpression.java
similarity index 99%
rename from test12/src/main/java/org/apache/shale/test/el/MockMethodExpression.java
rename to test12/src/main/java/org/apache/myfaces/test/el/MockMethodExpression.java
index ab9e970..223bb2f 100644
--- a/test12/src/main/java/org/apache/shale/test/el/MockMethodExpression.java
+++ b/test12/src/main/java/org/apache/myfaces/test/el/MockMethodExpression.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shale.test.el;
+package org.apache.myfaces.test.el;
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;
diff --git a/test12/src/main/java/org/apache/shale/test/el/MockValueExpression.java b/test12/src/main/java/org/apache/myfaces/test/el/MockValueExpression.java
similarity index 99%
rename from test12/src/main/java/org/apache/shale/test/el/MockValueExpression.java
rename to test12/src/main/java/org/apache/myfaces/test/el/MockValueExpression.java
index 641e6f1..dada6b2 100644
--- a/test12/src/main/java/org/apache/shale/test/el/MockValueExpression.java
+++ b/test12/src/main/java/org/apache/myfaces/test/el/MockValueExpression.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shale.test.el;
+package org.apache.myfaces.test.el;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/test12/src/main/java/org/apache/shale/test/el/MockVariableMapper.java b/test12/src/main/java/org/apache/myfaces/test/el/MockVariableMapper.java
similarity index 98%
rename from test12/src/main/java/org/apache/shale/test/el/MockVariableMapper.java
rename to test12/src/main/java/org/apache/myfaces/test/el/MockVariableMapper.java
index 2f5c15e..8414810 100644
--- a/test12/src/main/java/org/apache/shale/test/el/MockVariableMapper.java
+++ b/test12/src/main/java/org/apache/myfaces/test/el/MockVariableMapper.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shale.test.el;
+package org.apache.myfaces.test.el;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/test12/src/main/java/org/apache/shale/test/el/MockVariableValueExpression.java b/test12/src/main/java/org/apache/myfaces/test/el/MockVariableValueExpression.java
similarity index 99%
rename from test12/src/main/java/org/apache/shale/test/el/MockVariableValueExpression.java
rename to test12/src/main/java/org/apache/myfaces/test/el/MockVariableValueExpression.java
index dd4e17f..5b1cd0f 100644
--- a/test12/src/main/java/org/apache/shale/test/el/MockVariableValueExpression.java
+++ b/test12/src/main/java/org/apache/myfaces/test/el/MockVariableValueExpression.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shale.test.el;
+package org.apache.myfaces.test.el;
 
 import javax.el.ELContext;
 import javax.el.PropertyNotWritableException;
diff --git a/test12/src/main/java/org/apache/shale/test/el/package.html b/test12/src/main/java/org/apache/myfaces/test/el/package.html
similarity index 100%
rename from test12/src/main/java/org/apache/shale/test/el/package.html
rename to test12/src/main/java/org/apache/myfaces/test/el/package.html
diff --git a/test12/src/main/java/org/apache/shale/test/htmlunit/AbstractHtmlUnitTestCase.java b/test12/src/main/java/org/apache/myfaces/test/htmlunit/AbstractHtmlUnitTestCase.java
similarity index 99%
rename from test12/src/main/java/org/apache/shale/test/htmlunit/AbstractHtmlUnitTestCase.java
rename to test12/src/main/java/org/apache/myfaces/test/htmlunit/AbstractHtmlUnitTestCase.java
index b4f8435..f7be244 100644
--- a/test12/src/main/java/org/apache/shale/test/htmlunit/AbstractHtmlUnitTestCase.java
+++ b/test12/src/main/java/org/apache/myfaces/test/htmlunit/AbstractHtmlUnitTestCase.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shale.test.htmlunit;
+package org.apache.myfaces.test.htmlunit;
 
 import com.gargoylesoftware.htmlunit.ElementNotFoundException;
 import com.gargoylesoftware.htmlunit.WebClient;
diff --git a/test12/src/main/java/org/apache/shale/test/jmock/AbstractJmockJsfTestCase.java b/test12/src/main/java/org/apache/myfaces/test/jmock/AbstractJmockJsfTestCase.java
similarity index 86%
rename from test12/src/main/java/org/apache/shale/test/jmock/AbstractJmockJsfTestCase.java
rename to test12/src/main/java/org/apache/myfaces/test/jmock/AbstractJmockJsfTestCase.java
index 0e91c31..309f526 100644
--- a/test12/src/main/java/org/apache/shale/test/jmock/AbstractJmockJsfTestCase.java
+++ b/test12/src/main/java/org/apache/myfaces/test/jmock/AbstractJmockJsfTestCase.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shale.test.jmock;
+package org.apache.myfaces.test.jmock;
 
 import java.net.URL;
 import java.net.URLClassLoader;
@@ -26,18 +26,18 @@ import javax.faces.component.UIViewRoot;
 import javax.faces.lifecycle.LifecycleFactory;
 import javax.faces.render.RenderKitFactory;
 
-import org.apache.shale.test.mock.MockApplication;
-import org.apache.shale.test.mock.MockExternalContext;
-import org.apache.shale.test.mock.MockFacesContext;
-import org.apache.shale.test.mock.MockFacesContextFactory;
-import org.apache.shale.test.mock.MockHttpServletRequest;
-import org.apache.shale.test.mock.MockHttpServletResponse;
-import org.apache.shale.test.mock.MockHttpSession;
-import org.apache.shale.test.mock.MockRenderKit;
-import org.apache.shale.test.mock.MockServletConfig;
-import org.apache.shale.test.mock.MockServletContext;
-import org.apache.shale.test.mock.lifecycle.MockLifecycle;
-import org.apache.shale.test.mock.lifecycle.MockLifecycleFactory;
+import org.apache.myfaces.test.mock.MockApplication;
+import org.apache.myfaces.test.mock.MockExternalContext;
+import org.apache.myfaces.test.mock.MockFacesContext;
+import org.apache.myfaces.test.mock.MockFacesContextFactory;
+import org.apache.myfaces.test.mock.MockHttpServletRequest;
+import org.apache.myfaces.test.mock.MockHttpServletResponse;
+import org.apache.myfaces.test.mock.MockHttpSession;
+import org.apache.myfaces.test.mock.MockRenderKit;
+import org.apache.myfaces.test.mock.MockServletConfig;
+import org.apache.myfaces.test.mock.MockServletContext;
+import org.apache.myfaces.test.mock.lifecycle.MockLifecycle;
+import org.apache.myfaces.test.mock.lifecycle.MockLifecycleFactory;
 import org.jmock.cglib.MockObjectTestCase;
 
 /**
@@ -105,13 +105,13 @@ public abstract class AbstractJmockJsfTestCase extends MockObjectTestCase {
         // Set up JSF API Objects
         FactoryFinder.releaseFactories();
         FactoryFinder.setFactory(FactoryFinder.APPLICATION_FACTORY,
-        "org.apache.shale.test.mock.MockApplicationFactory");
+        "org.apache.myfaces.test.mock.MockApplicationFactory");
         FactoryFinder.setFactory(FactoryFinder.FACES_CONTEXT_FACTORY,
-        "org.apache.shale.test.mock.MockFacesContextFactory");
+        "org.apache.myfaces.test.mock.MockFacesContextFactory");
         FactoryFinder.setFactory(FactoryFinder.LIFECYCLE_FACTORY,
-        "org.apache.shale.test.mock.lifecycle.MockLifecycleFactory");
+        "org.apache.myfaces.test.mock.lifecycle.MockLifecycleFactory");
         FactoryFinder.setFactory(FactoryFinder.RENDER_KIT_FACTORY,
-        "org.apache.shale.test.mock.MockRenderKitFactory");
+        "org.apache.myfaces.test.mock.MockRenderKitFactory");
         
         externalContext =
             new MockExternalContext(servletContext, request, response);
diff --git a/test12/src/main/java/org/apache/shale/test/mock/MockActionListener.java b/test12/src/main/java/org/apache/myfaces/test/mock/MockActionListener.java
similarity index 98%
rename from test12/src/main/java/org/apache/shale/test/mock/MockActionListener.java
rename to test12/src/main/java/org/apache/myfaces/test/mock/MockActionListener.java
index 02e8197..c9b30ab 100644
--- a/test12/src/main/java/org/apache/shale/test/mock/MockActionListener.java
+++ b/test12/src/main/java/org/apache/myfaces/test/mock/MockActionListener.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shale.test.mock;
+package org.apache.myfaces.test.mock;
 
 import javax.faces.event.AbortProcessingException;
 import javax.faces.event.ActionEvent;
diff --git a/test12/src/main/java/org/apache/shale/test/mock/MockApplication.java b/test12/src/main/java/org/apache/myfaces/test/mock/MockApplication.java
similarity index 99%
rename from test12/src/main/java/org/apache/shale/test/mock/MockApplication.java
rename to test12/src/main/java/org/apache/myfaces/test/mock/MockApplication.java
index b112ab7..c7f3137 100644
--- a/test12/src/main/java/org/apache/shale/test/mock/MockApplication.java
+++ b/test12/src/main/java/org/apache/myfaces/test/mock/MockApplication.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shale.test.mock;
+package org.apache.myfaces.test.mock;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/test12/src/main/java/org/apache/shale/test/mock/MockApplication12.java b/test12/src/main/java/org/apache/myfaces/test/mock/MockApplication12.java
similarity index 94%
rename from test12/src/main/java/org/apache/shale/test/mock/MockApplication12.java
rename to test12/src/main/java/org/apache/myfaces/test/mock/MockApplication12.java
index 9099b24..28e4ba5 100644
--- a/test12/src/main/java/org/apache/shale/test/mock/MockApplication12.java
+++ b/test12/src/main/java/org/apache/myfaces/test/mock/MockApplication12.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shale.test.mock;
+package org.apache.myfaces.test.mock;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -39,12 +39,13 @@ import javax.faces.FacesException;
 import javax.faces.component.UIComponent;
 import javax.faces.component.UIViewRoot;
 import javax.faces.context.FacesContext;
-import org.apache.shale.test.el.FacesImplicitObjectELResolver;
-import org.apache.shale.test.el.FacesPropertyResolverChainWrapper;
-import org.apache.shale.test.el.FacesResourceBundleELResolver;
-import org.apache.shale.test.el.FacesScopedAttributeELResolver;
-import org.apache.shale.test.el.FacesVariableResolverChainWrapper;
-import org.apache.shale.test.el.MockExpressionFactory;
+
+import org.apache.myfaces.test.el.FacesImplicitObjectELResolver;
+import org.apache.myfaces.test.el.FacesPropertyResolverChainWrapper;
+import org.apache.myfaces.test.el.FacesResourceBundleELResolver;
+import org.apache.myfaces.test.el.FacesScopedAttributeELResolver;
+import org.apache.myfaces.test.el.FacesVariableResolverChainWrapper;
+import org.apache.myfaces.test.el.MockExpressionFactory;
 
 /**
  * <p>Mock implementation of <code>ExternalContext</code> that includes the semantics
diff --git a/test12/src/main/java/org/apache/shale/test/mock/MockApplicationFactory.java b/test12/src/main/java/org/apache/myfaces/test/mock/MockApplicationFactory.java
similarity index 94%
rename from test12/src/main/java/org/apache/shale/test/mock/MockApplicationFactory.java
rename to test12/src/main/java/org/apache/myfaces/test/mock/MockApplicationFactory.java
index e8dba9e..b0d05d4 100644
--- a/test12/src/main/java/org/apache/shale/test/mock/MockApplicationFactory.java
+++ b/test12/src/main/java/org/apache/myfaces/test/mock/MockApplicationFactory.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shale.test.mock;
+package org.apache.myfaces.test.mock;
 
 import javax.faces.FacesException;
 import javax.faces.application.Application;
@@ -64,7 +64,7 @@ public class MockApplicationFactory extends ApplicationFactory {
             Class clazz = null;
             try {
                 clazz = this.getClass().getClassLoader().loadClass
-                  ("org.apache.shale.test.mock.MockApplication12");
+                  ("org.apache.myfaces.test.mock.MockApplication12");
                 this.application = (MockApplication) clazz.newInstance();
             } catch (NoClassDefFoundError e) {
                 clazz = null; // We are not running in a JSF 1.2 environment
@@ -78,7 +78,7 @@ public class MockApplicationFactory extends ApplicationFactory {
             if (clazz == null) {
                 try {
                     clazz = this.getClass().getClassLoader().loadClass
-                      ("org.apache.shale.test.mock.MockApplication");
+                      ("org.apache.myfaces.test.mock.MockApplication");
                     this.application = (MockApplication) clazz.newInstance();
                 } catch (RuntimeException e) {
                     throw e;
diff --git a/test12/src/main/java/org/apache/shale/test/mock/MockApplicationMap.java b/test12/src/main/java/org/apache/myfaces/test/mock/MockApplicationMap.java
similarity index 99%
rename from test12/src/main/java/org/apache/shale/test/mock/MockApplicationMap.java
rename to test12/src/main/java/org/apache/myfaces/test/mock/MockApplicationMap.java
index 9db19e1..393b80b 100644
--- a/test12/src/main/java/org/apache/shale/test/mock/MockApplicationMap.java
+++ b/test12/src/main/java/org/apache/myfaces/test/mock/MockApplicationMap.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shale.test.mock;
+package org.apache.myfaces.test.mock;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/test12/src/main/java/org/apache/shale/test/mock/MockEnumeration.java b/test12/src/main/java/org/apache/myfaces/test/mock/MockEnumeration.java
similarity index 98%
rename from test12/src/main/java/org/apache/shale/test/mock/MockEnumeration.java
rename to test12/src/main/java/org/apache/myfaces/test/mock/MockEnumeration.java
index 19a5571..c0a7b93 100644
--- a/test12/src/main/java/org/apache/shale/test/mock/MockEnumeration.java
+++ b/test12/src/main/java/org/apache/myfaces/test/mock/MockEnumeration.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shale.test.mock;
+package org.apache.myfaces.test.mock;
 
 import java.util.Enumeration;
 import java.util.Iterator;
diff --git a/test12/src/main/java/org/apache/shale/test/mock/MockExternalContext.java b/test12/src/main/java/org/apache/myfaces/test/mock/MockExternalContext.java
similarity index 99%
rename from test12/src/main/java/org/apache/shale/test/mock/MockExternalContext.java
rename to test12/src/main/java/org/apache/myfaces/test/mock/MockExternalContext.java
index b2fd650..8c47099 100644
--- a/test12/src/main/java/org/apache/shale/test/mock/MockExternalContext.java
+++ b/test12/src/main/java/org/apache/myfaces/test/mock/MockExternalContext.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shale.test.mock;
+package org.apache.myfaces.test.mock;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/test12/src/main/java/org/apache/shale/test/mock/MockExternalContext12.java b/test12/src/main/java/org/apache/myfaces/test/mock/MockExternalContext12.java
similarity index 98%
rename from test12/src/main/java/org/apache/shale/test/mock/MockExternalContext12.java
rename to test12/src/main/java/org/apache/myfaces/test/mock/MockExternalContext12.java
index 86e8b6e..da45194 100644
--- a/test12/src/main/java/org/apache/shale/test/mock/MockExternalContext12.java
+++ b/test12/src/main/java/org/apache/myfaces/test/mock/MockExternalContext12.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shale.test.mock;
+package org.apache.myfaces.test.mock;
 
 import java.io.UnsupportedEncodingException;
 import javax.servlet.ServletContext;
diff --git a/test12/src/main/java/org/apache/shale/test/mock/MockFacesContext.java b/test12/src/main/java/org/apache/myfaces/test/mock/MockFacesContext.java
similarity index 95%
rename from test12/src/main/java/org/apache/shale/test/mock/MockFacesContext.java
rename to test12/src/main/java/org/apache/myfaces/test/mock/MockFacesContext.java
index adc2d53..af90e78 100644
--- a/test12/src/main/java/org/apache/shale/test/mock/MockFacesContext.java
+++ b/test12/src/main/java/org/apache/myfaces/test/mock/MockFacesContext.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shale.test.mock;
+package org.apache.myfaces.test.mock;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/test12/src/main/java/org/apache/shale/test/mock/MockFacesContext12.java b/test12/src/main/java/org/apache/myfaces/test/mock/MockFacesContext12.java
similarity index 97%
rename from test12/src/main/java/org/apache/shale/test/mock/MockFacesContext12.java
rename to test12/src/main/java/org/apache/myfaces/test/mock/MockFacesContext12.java
index e5ed652..128e855 100644
--- a/test12/src/main/java/org/apache/shale/test/mock/MockFacesContext12.java
+++ b/test12/src/main/java/org/apache/myfaces/test/mock/MockFacesContext12.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shale.test.mock;
+package org.apache.myfaces.test.mock;
 
 import javax.el.ELContext;
 import javax.el.ELContextEvent;
@@ -23,7 +23,8 @@ import javax.el.ELContextListener;
 import javax.faces.context.ExternalContext;
 import javax.faces.context.FacesContext;
 import javax.faces.lifecycle.Lifecycle;
-import org.apache.shale.test.el.MockELContext;
+
+import org.apache.myfaces.test.el.MockELContext;
 
 /**
  * <p>Mock implementation of <code>FacesContext</code> that includes the semantics
diff --git a/test12/src/main/java/org/apache/shale/test/mock/MockFacesContextFactory.java b/test12/src/main/java/org/apache/myfaces/test/mock/MockFacesContextFactory.java
similarity index 96%
rename from test12/src/main/java/org/apache/shale/test/mock/MockFacesContextFactory.java
rename to test12/src/main/java/org/apache/myfaces/test/mock/MockFacesContextFactory.java
index 9b6aee9..c032826 100644
--- a/test12/src/main/java/org/apache/shale/test/mock/MockFacesContextFactory.java
+++ b/test12/src/main/java/org/apache/myfaces/test/mock/MockFacesContextFactory.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shale.test.mock;
+package org.apache.myfaces.test.mock;
 
 import java.lang.reflect.Constructor;
 import javax.faces.FacesException;
@@ -49,7 +49,7 @@ public class MockFacesContextFactory extends FacesContextFactory {
 
         // Try to load the 1.2 version of our mock FacesContext class
         try {
-            clazz = this.getClass().getClassLoader().loadClass("org.apache.shale.test.mock.MockFacesContext12");
+            clazz = this.getClass().getClassLoader().loadClass("org.apache.myfaces.test.mock.MockFacesContext12");
             constructor = clazz.getConstructor(facesContextSignature);
             jsf12 = true;
         } catch (NoClassDefFoundError e) {
@@ -69,7 +69,7 @@ public class MockFacesContextFactory extends FacesContextFactory {
         // Fall back to the 1.1 version if we could not load the 1.2 version
         try {
             if (clazz == null) {
-                clazz = this.getClass().getClassLoader().loadClass("org.apache.shale.test.mock.MockFacesContext");
+                clazz = this.getClass().getClassLoader().loadClass("org.apache.myfaces.test.mock.MockFacesContext");
                 constructor = clazz.getConstructor(facesContextSignature);
                 jsf12 = false;
             }
@@ -130,7 +130,7 @@ public class MockFacesContextFactory extends FacesContextFactory {
         if (jsf12) {
             try {
                 clazz = this.getClass().getClassLoader().loadClass
-                  ("org.apache.shale.test.mock.MockExternalContext12");
+                  ("org.apache.myfaces.test.mock.MockExternalContext12");
             } catch (RuntimeException e) {
                 throw e;
             } catch (Exception e) {
diff --git a/test12/src/main/java/org/apache/shale/test/mock/MockHttpServletRequest.java b/test12/src/main/java/org/apache/myfaces/test/mock/MockHttpServletRequest.java
similarity index 99%
rename from test12/src/main/java/org/apache/shale/test/mock/MockHttpServletRequest.java
rename to test12/src/main/java/org/apache/myfaces/test/mock/MockHttpServletRequest.java
index e8d2bb8..bec0ffb 100644
--- a/test12/src/main/java/org/apache/shale/test/mock/MockHttpServletRequest.java
+++ b/test12/src/main/java/org/apache/myfaces/test/mock/MockHttpServletRequest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shale.test.mock;
+package org.apache.myfaces.test.mock;
 
 import java.io.BufferedReader;
 import java.security.Principal;
@@ -694,7 +694,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
     public String getRemoteHost() {
 
         // i figure testing never assumes a specific remote - so anything works
-        return "ShaleServer";
+        return "MyfacesServer";
 
     }
 
diff --git a/test12/src/main/java/org/apache/shale/test/mock/MockHttpServletResponse.java b/test12/src/main/java/org/apache/myfaces/test/mock/MockHttpServletResponse.java
similarity index 99%
rename from test12/src/main/java/org/apache/shale/test/mock/MockHttpServletResponse.java
rename to test12/src/main/java/org/apache/myfaces/test/mock/MockHttpServletResponse.java
index fdbcb5b..ab18d5e 100644
--- a/test12/src/main/java/org/apache/shale/test/mock/MockHttpServletResponse.java
+++ b/test12/src/main/java/org/apache/myfaces/test/mock/MockHttpServletResponse.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shale.test.mock;
+package org.apache.myfaces.test.mock;
 
 import java.io.ByteArrayOutputStream;
 import java.io.CharArrayWriter;
diff --git a/test12/src/main/java/org/apache/shale/test/mock/MockHttpSession.java b/test12/src/main/java/org/apache/myfaces/test/mock/MockHttpSession.java
similarity index 99%
rename from test12/src/main/java/org/apache/shale/test/mock/MockHttpSession.java
rename to test12/src/main/java/org/apache/myfaces/test/mock/MockHttpSession.java
index e32a27c..80fb5cb 100644
--- a/test12/src/main/java/org/apache/shale/test/mock/MockHttpSession.java
+++ b/test12/src/main/java/org/apache/myfaces/test/mock/MockHttpSession.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shale.test.mock;
+package org.apache.myfaces.test.mock;
 
 import java.util.ArrayList;
 import java.util.Enumeration;
diff --git a/test12/src/main/java/org/apache/shale/test/mock/MockMethodBinding.java b/test12/src/main/java/org/apache/myfaces/test/mock/MockMethodBinding.java
similarity index 99%
rename from test12/src/main/java/org/apache/shale/test/mock/MockMethodBinding.java
rename to test12/src/main/java/org/apache/myfaces/test/mock/MockMethodBinding.java
index 2a7a39c..2c14ad4 100644
--- a/test12/src/main/java/org/apache/shale/test/mock/MockMethodBinding.java
+++ b/test12/src/main/java/org/apache/myfaces/test/mock/MockMethodBinding.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shale.test.mock;
+package org.apache.myfaces.test.mock;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
diff --git a/test12/src/main/java/org/apache/shale/test/mock/MockNavigationHandler.java b/test12/src/main/java/org/apache/myfaces/test/mock/MockNavigationHandler.java
similarity index 98%
rename from test12/src/main/java/org/apache/shale/test/mock/MockNavigationHandler.java
rename to test12/src/main/java/org/apache/myfaces/test/mock/MockNavigationHandler.java
index c93dbd0..de33f29 100644
--- a/test12/src/main/java/org/apache/shale/test/mock/MockNavigationHandler.java
+++ b/test12/src/main/java/org/apache/myfaces/test/mock/MockNavigationHandler.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shale.test.mock;
+package org.apache.myfaces.test.mock;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/test12/src/main/java/org/apache/shale/test/mock/MockPortletContext.java b/test12/src/main/java/org/apache/myfaces/test/mock/MockPortletContext.java
similarity index 99%
rename from test12/src/main/java/org/apache/shale/test/mock/MockPortletContext.java
rename to test12/src/main/java/org/apache/myfaces/test/mock/MockPortletContext.java
index fcd24a8..400b0b4 100644
--- a/test12/src/main/java/org/apache/shale/test/mock/MockPortletContext.java
+++ b/test12/src/main/java/org/apache/myfaces/test/mock/MockPortletContext.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shale.test.mock;
+package org.apache.myfaces.test.mock;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/test12/src/main/java/org/apache/shale/test/mock/MockPortletRequest.java b/test12/src/main/java/org/apache/myfaces/test/mock/MockPortletRequest.java
similarity index 99%
rename from test12/src/main/java/org/apache/shale/test/mock/MockPortletRequest.java
rename to test12/src/main/java/org/apache/myfaces/test/mock/MockPortletRequest.java
index 83c96b5..4afb43d 100644
--- a/test12/src/main/java/org/apache/shale/test/mock/MockPortletRequest.java
+++ b/test12/src/main/java/org/apache/myfaces/test/mock/MockPortletRequest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shale.test.mock;
+package org.apache.myfaces.test.mock;
 
 import java.security.Principal;
 import java.util.Enumeration;
diff --git a/test12/src/main/java/org/apache/shale/test/mock/MockPortletResponse.java b/test12/src/main/java/org/apache/myfaces/test/mock/MockPortletResponse.java
similarity index 97%
rename from test12/src/main/java/org/apache/shale/test/mock/MockPortletResponse.java
rename to test12/src/main/java/org/apache/myfaces/test/mock/MockPortletResponse.java
index b3ae1ea..c348322 100644
--- a/test12/src/main/java/org/apache/shale/test/mock/MockPortletResponse.java
+++ b/test12/src/main/java/org/apache/myfaces/test/mock/MockPortletResponse.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shale.test.mock;
+package org.apache.myfaces.test.mock;
 
 import javax.portlet.PortletResponse;
 
diff --git a/test12/src/main/java/org/apache/shale/test/mock/MockPortletSession.java b/test12/src/main/java/org/apache/myfaces/test/mock/MockPortletSession.java
similarity index 99%
rename from test12/src/main/java/org/apache/shale/test/mock/MockPortletSession.java
rename to test12/src/main/java/org/apache/myfaces/test/mock/MockPortletSession.java
index 96d182b..3555d79 100644
--- a/test12/src/main/java/org/apache/shale/test/mock/MockPortletSession.java
+++ b/test12/src/main/java/org/apache/myfaces/test/mock/MockPortletSession.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shale.test.mock;
+package org.apache.myfaces.test.mock;
 
 import java.util.Enumeration;
 import java.util.HashMap;
diff --git a/test12/src/main/java/org/apache/shale/test/mock/MockPrincipal.java b/test12/src/main/java/org/apache/myfaces/test/mock/MockPrincipal.java
similarity index 98%
rename from test12/src/main/java/org/apache/shale/test/mock/MockPrincipal.java
rename to test12/src/main/java/org/apache/myfaces/test/mock/MockPrincipal.java
index 61cff64..152194a 100644
--- a/test12/src/main/java/org/apache/shale/test/mock/MockPrincipal.java
+++ b/test12/src/main/java/org/apache/myfaces/test/mock/MockPrincipal.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shale.test.mock;
+package org.apache.myfaces.test.mock;
 
 import java.security.Principal;
 
diff --git a/test12/src/main/java/org/apache/shale/test/mock/MockPrintWriter.java b/test12/src/main/java/org/apache/myfaces/test/mock/MockPrintWriter.java
similarity index 98%
rename from test12/src/main/java/org/apache/shale/test/mock/MockPrintWriter.java
rename to test12/src/main/java/org/apache/myfaces/test/mock/MockPrintWriter.java
index d0aeab0..46cb612 100644
--- a/test12/src/main/java/org/apache/shale/test/mock/MockPrintWriter.java
+++ b/test12/src/main/java/org/apache/myfaces/test/mock/MockPrintWriter.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shale.test.mock;
+package org.apache.myfaces.test.mock;
 
 import java.io.CharArrayWriter;
 import java.io.PrintWriter;
diff --git a/test12/src/main/java/org/apache/shale/test/mock/MockPropertyResolver.java b/test12/src/main/java/org/apache/myfaces/test/mock/MockPropertyResolver.java
similarity index 99%
rename from test12/src/main/java/org/apache/shale/test/mock/MockPropertyResolver.java
rename to test12/src/main/java/org/apache/myfaces/test/mock/MockPropertyResolver.java
index e7818f2..bb59c12 100644
--- a/test12/src/main/java/org/apache/shale/test/mock/MockPropertyResolver.java
+++ b/test12/src/main/java/org/apache/myfaces/test/mock/MockPropertyResolver.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shale.test.mock;
+package org.apache.myfaces.test.mock;
 
 import java.beans.BeanInfo;
 import java.beans.IntrospectionException;
diff --git a/test12/src/main/java/org/apache/shale/test/mock/MockRenderKit.java b/test12/src/main/java/org/apache/myfaces/test/mock/MockRenderKit.java
similarity index 98%
rename from test12/src/main/java/org/apache/shale/test/mock/MockRenderKit.java
rename to test12/src/main/java/org/apache/myfaces/test/mock/MockRenderKit.java
index 24814bc..8d505fc 100644
--- a/test12/src/main/java/org/apache/shale/test/mock/MockRenderKit.java
+++ b/test12/src/main/java/org/apache/myfaces/test/mock/MockRenderKit.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shale.test.mock;
+package org.apache.myfaces.test.mock;
 
 import java.io.IOException;
 import java.io.OutputStream;
diff --git a/test12/src/main/java/org/apache/shale/test/mock/MockRenderKitFactory.java b/test12/src/main/java/org/apache/myfaces/test/mock/MockRenderKitFactory.java
similarity index 98%
rename from test12/src/main/java/org/apache/shale/test/mock/MockRenderKitFactory.java
rename to test12/src/main/java/org/apache/myfaces/test/mock/MockRenderKitFactory.java
index 65c14e3..6c1d032 100644
--- a/test12/src/main/java/org/apache/shale/test/mock/MockRenderKitFactory.java
+++ b/test12/src/main/java/org/apache/myfaces/test/mock/MockRenderKitFactory.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shale.test.mock;
+package org.apache.myfaces.test.mock;
 
 import java.util.HashMap;
 import java.util.Iterator;
diff --git a/test12/src/main/java/org/apache/shale/test/mock/MockRequestMap.java b/test12/src/main/java/org/apache/myfaces/test/mock/MockRequestMap.java
similarity index 99%
rename from test12/src/main/java/org/apache/shale/test/mock/MockRequestMap.java
rename to test12/src/main/java/org/apache/myfaces/test/mock/MockRequestMap.java
index 55ecc85..f712f0c 100644
--- a/test12/src/main/java/org/apache/shale/test/mock/MockRequestMap.java
+++ b/test12/src/main/java/org/apache/myfaces/test/mock/MockRequestMap.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shale.test.mock;
+package org.apache.myfaces.test.mock;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/test12/src/main/java/org/apache/shale/test/mock/MockResponseWriter.java b/test12/src/main/java/org/apache/myfaces/test/mock/MockResponseWriter.java
similarity index 99%
rename from test12/src/main/java/org/apache/shale/test/mock/MockResponseWriter.java
rename to test12/src/main/java/org/apache/myfaces/test/mock/MockResponseWriter.java
index efe550d..83c7176 100644
--- a/test12/src/main/java/org/apache/shale/test/mock/MockResponseWriter.java
+++ b/test12/src/main/java/org/apache/myfaces/test/mock/MockResponseWriter.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shale.test.mock;
+package org.apache.myfaces.test.mock;
 
 import java.io.IOException;
 import java.io.Writer;
diff --git a/test12/src/main/java/org/apache/shale/test/mock/MockServlet.java b/test12/src/main/java/org/apache/myfaces/test/mock/MockServlet.java
similarity index 98%
rename from test12/src/main/java/org/apache/shale/test/mock/MockServlet.java
rename to test12/src/main/java/org/apache/myfaces/test/mock/MockServlet.java
index 63d6d10..296949a 100644
--- a/test12/src/main/java/org/apache/shale/test/mock/MockServlet.java
+++ b/test12/src/main/java/org/apache/myfaces/test/mock/MockServlet.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shale.test.mock;
+package org.apache.myfaces.test.mock;
 
 import java.io.IOException;
 
diff --git a/test12/src/main/java/org/apache/shale/test/mock/MockServletConfig.java b/test12/src/main/java/org/apache/myfaces/test/mock/MockServletConfig.java
similarity index 98%
rename from test12/src/main/java/org/apache/shale/test/mock/MockServletConfig.java
rename to test12/src/main/java/org/apache/myfaces/test/mock/MockServletConfig.java
index 2fc1cc2..cf6e737 100644
--- a/test12/src/main/java/org/apache/shale/test/mock/MockServletConfig.java
+++ b/test12/src/main/java/org/apache/myfaces/test/mock/MockServletConfig.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shale.test.mock;
+package org.apache.myfaces.test.mock;
 
 import java.util.Enumeration;
 import java.util.Hashtable;
diff --git a/test12/src/main/java/org/apache/shale/test/mock/MockServletContext.java b/test12/src/main/java/org/apache/myfaces/test/mock/MockServletContext.java
similarity index 99%
rename from test12/src/main/java/org/apache/shale/test/mock/MockServletContext.java
rename to test12/src/main/java/org/apache/myfaces/test/mock/MockServletContext.java
index 13c8007..5300be1 100644
--- a/test12/src/main/java/org/apache/shale/test/mock/MockServletContext.java
+++ b/test12/src/main/java/org/apache/myfaces/test/mock/MockServletContext.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shale.test.mock;
+package org.apache.myfaces.test.mock;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/test12/src/main/java/org/apache/shale/test/mock/MockServletOutputStream.java b/test12/src/main/java/org/apache/myfaces/test/mock/MockServletOutputStream.java
similarity index 98%
rename from test12/src/main/java/org/apache/shale/test/mock/MockServletOutputStream.java
rename to test12/src/main/java/org/apache/myfaces/test/mock/MockServletOutputStream.java
index 7c58d83..23428c6 100644
--- a/test12/src/main/java/org/apache/shale/test/mock/MockServletOutputStream.java
+++ b/test12/src/main/java/org/apache/myfaces/test/mock/MockServletOutputStream.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shale.test.mock;
+package org.apache.myfaces.test.mock;
 
 import java.io.ByteArrayOutputStream;
 import javax.servlet.ServletOutputStream;
diff --git a/test12/src/main/java/org/apache/shale/test/mock/MockSessionMap.java b/test12/src/main/java/org/apache/myfaces/test/mock/MockSessionMap.java
similarity index 99%
rename from test12/src/main/java/org/apache/shale/test/mock/MockSessionMap.java
rename to test12/src/main/java/org/apache/myfaces/test/mock/MockSessionMap.java
index 763dd9c..788e195 100644
--- a/test12/src/main/java/org/apache/shale/test/mock/MockSessionMap.java
+++ b/test12/src/main/java/org/apache/myfaces/test/mock/MockSessionMap.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shale.test.mock;
+package org.apache.myfaces.test.mock;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/test12/src/main/java/org/apache/shale/test/mock/MockStateManager.java b/test12/src/main/java/org/apache/myfaces/test/mock/MockStateManager.java
similarity index 98%
rename from test12/src/main/java/org/apache/shale/test/mock/MockStateManager.java
rename to test12/src/main/java/org/apache/myfaces/test/mock/MockStateManager.java
index 59323ac..071d074 100644
--- a/test12/src/main/java/org/apache/shale/test/mock/MockStateManager.java
+++ b/test12/src/main/java/org/apache/myfaces/test/mock/MockStateManager.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shale.test.mock;
+package org.apache.myfaces.test.mock;
 
 import java.io.IOException;
 
diff --git a/test12/src/main/java/org/apache/shale/test/mock/MockValueBinding.java b/test12/src/main/java/org/apache/myfaces/test/mock/MockValueBinding.java
similarity index 99%
rename from test12/src/main/java/org/apache/shale/test/mock/MockValueBinding.java
rename to test12/src/main/java/org/apache/myfaces/test/mock/MockValueBinding.java
index 7abdd5e..e154a99 100644
--- a/test12/src/main/java/org/apache/shale/test/mock/MockValueBinding.java
+++ b/test12/src/main/java/org/apache/myfaces/test/mock/MockValueBinding.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shale.test.mock;
+package org.apache.myfaces.test.mock;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/test12/src/main/java/org/apache/shale/test/mock/MockVariableResolver.java b/test12/src/main/java/org/apache/myfaces/test/mock/MockVariableResolver.java
similarity index 99%
rename from test12/src/main/java/org/apache/shale/test/mock/MockVariableResolver.java
rename to test12/src/main/java/org/apache/myfaces/test/mock/MockVariableResolver.java
index 594a76e..1ba4f51 100644
--- a/test12/src/main/java/org/apache/shale/test/mock/MockVariableResolver.java
+++ b/test12/src/main/java/org/apache/myfaces/test/mock/MockVariableResolver.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shale.test.mock;
+package org.apache.myfaces.test.mock;
 
 import java.util.Map;
 
diff --git a/test12/src/main/java/org/apache/shale/test/mock/MockViewHandler.java b/test12/src/main/java/org/apache/myfaces/test/mock/MockViewHandler.java
similarity index 99%
rename from test12/src/main/java/org/apache/shale/test/mock/MockViewHandler.java
rename to test12/src/main/java/org/apache/myfaces/test/mock/MockViewHandler.java
index f88cf7f..b0f4158 100644
--- a/test12/src/main/java/org/apache/shale/test/mock/MockViewHandler.java
+++ b/test12/src/main/java/org/apache/myfaces/test/mock/MockViewHandler.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shale.test.mock;
+package org.apache.myfaces.test.mock;
 
 import java.util.Locale;
 
diff --git a/test12/src/main/java/org/apache/shale/test/mock/lifecycle/ApplyRequestValuesExecutor.java b/test12/src/main/java/org/apache/myfaces/test/mock/lifecycle/ApplyRequestValuesExecutor.java
similarity index 93%
rename from test12/src/main/java/org/apache/shale/test/mock/lifecycle/ApplyRequestValuesExecutor.java
rename to test12/src/main/java/org/apache/myfaces/test/mock/lifecycle/ApplyRequestValuesExecutor.java
index ba8824c..b2c74c6 100644
--- a/test12/src/main/java/org/apache/shale/test/mock/lifecycle/ApplyRequestValuesExecutor.java
+++ b/test12/src/main/java/org/apache/myfaces/test/mock/lifecycle/ApplyRequestValuesExecutor.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shale.test.mock.lifecycle;
+package org.apache.myfaces.test.mock.lifecycle;
 
 import javax.faces.context.FacesContext;
 import javax.faces.event.PhaseId;
diff --git a/test12/src/main/java/org/apache/shale/test/mock/lifecycle/DefaultRestoreViewSupport.java b/test12/src/main/java/org/apache/myfaces/test/mock/lifecycle/DefaultRestoreViewSupport.java
similarity index 96%
rename from test12/src/main/java/org/apache/shale/test/mock/lifecycle/DefaultRestoreViewSupport.java
rename to test12/src/main/java/org/apache/myfaces/test/mock/lifecycle/DefaultRestoreViewSupport.java
index a706633..f152d37 100644
--- a/test12/src/main/java/org/apache/shale/test/mock/lifecycle/DefaultRestoreViewSupport.java
+++ b/test12/src/main/java/org/apache/myfaces/test/mock/lifecycle/DefaultRestoreViewSupport.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shale.test.mock.lifecycle;
+package org.apache.myfaces.test.mock.lifecycle;
 
 import java.util.Iterator;
 import java.util.Map;
diff --git a/test12/src/main/java/org/apache/shale/test/mock/lifecycle/InvokeApplicationExecutor.java b/test12/src/main/java/org/apache/myfaces/test/mock/lifecycle/InvokeApplicationExecutor.java
similarity index 93%
rename from test12/src/main/java/org/apache/shale/test/mock/lifecycle/InvokeApplicationExecutor.java
rename to test12/src/main/java/org/apache/myfaces/test/mock/lifecycle/InvokeApplicationExecutor.java
index 682831a..35a15b3 100644
--- a/test12/src/main/java/org/apache/shale/test/mock/lifecycle/InvokeApplicationExecutor.java
+++ b/test12/src/main/java/org/apache/myfaces/test/mock/lifecycle/InvokeApplicationExecutor.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shale.test.mock.lifecycle;
+package org.apache.myfaces.test.mock.lifecycle;
 
 import javax.faces.context.FacesContext;
 import javax.faces.event.PhaseId;
diff --git a/test12/src/main/java/org/apache/shale/test/mock/lifecycle/MockLifecycle.java b/test12/src/main/java/org/apache/myfaces/test/mock/lifecycle/MockLifecycle.java
similarity index 99%
rename from test12/src/main/java/org/apache/shale/test/mock/lifecycle/MockLifecycle.java
rename to test12/src/main/java/org/apache/myfaces/test/mock/lifecycle/MockLifecycle.java
index 52e46e3..b1a6466 100644
--- a/test12/src/main/java/org/apache/shale/test/mock/lifecycle/MockLifecycle.java
+++ b/test12/src/main/java/org/apache/myfaces/test/mock/lifecycle/MockLifecycle.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shale.test.mock.lifecycle;
+package org.apache.myfaces.test.mock.lifecycle;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/test12/src/main/java/org/apache/shale/test/mock/lifecycle/MockLifecycleFactory.java b/test12/src/main/java/org/apache/myfaces/test/mock/lifecycle/MockLifecycleFactory.java
similarity index 97%
rename from test12/src/main/java/org/apache/shale/test/mock/lifecycle/MockLifecycleFactory.java
rename to test12/src/main/java/org/apache/myfaces/test/mock/lifecycle/MockLifecycleFactory.java
index 49d4c45..981616d 100644
--- a/test12/src/main/java/org/apache/shale/test/mock/lifecycle/MockLifecycleFactory.java
+++ b/test12/src/main/java/org/apache/myfaces/test/mock/lifecycle/MockLifecycleFactory.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shale.test.mock.lifecycle;
+package org.apache.myfaces.test.mock.lifecycle;
 
 import java.util.HashMap;
 import java.util.Iterator;
diff --git a/test12/src/main/java/org/apache/shale/test/mock/lifecycle/PhaseExecutor.java b/test12/src/main/java/org/apache/myfaces/test/mock/lifecycle/PhaseExecutor.java
similarity index 94%
rename from test12/src/main/java/org/apache/shale/test/mock/lifecycle/PhaseExecutor.java
rename to test12/src/main/java/org/apache/myfaces/test/mock/lifecycle/PhaseExecutor.java
index 257eb22..c052b36 100644
--- a/test12/src/main/java/org/apache/shale/test/mock/lifecycle/PhaseExecutor.java
+++ b/test12/src/main/java/org/apache/myfaces/test/mock/lifecycle/PhaseExecutor.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.shale.test.mock.lifecycle;
+package org.apache.myfaces.test.mock.lifecycle;
 
 
 import javax.faces.context.FacesContext;
diff --git a/test12/src/main/java/org/apache/shale/test/mock/lifecycle/PhaseListenerManager.java b/test12/src/main/java/org/apache/myfaces/test/mock/lifecycle/PhaseListenerManager.java
similarity index 96%
rename from test12/src/main/java/org/apache/shale/test/mock/lifecycle/PhaseListenerManager.java
rename to test12/src/main/java/org/apache/myfaces/test/mock/lifecycle/PhaseListenerManager.java
index 87826dd..3728438 100644
--- a/test12/src/main/java/org/apache/shale/test/mock/lifecycle/PhaseListenerManager.java
+++ b/test12/src/main/java/org/apache/myfaces/test/mock/lifecycle/PhaseListenerManager.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shale.test.mock.lifecycle;
+package org.apache.myfaces.test.mock.lifecycle;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/test12/src/main/java/org/apache/shale/test/mock/lifecycle/ProcessValidationsExecutor.java b/test12/src/main/java/org/apache/myfaces/test/mock/lifecycle/ProcessValidationsExecutor.java
similarity index 93%
rename from test12/src/main/java/org/apache/shale/test/mock/lifecycle/ProcessValidationsExecutor.java
rename to test12/src/main/java/org/apache/myfaces/test/mock/lifecycle/ProcessValidationsExecutor.java
index 48d0e26..8a875fc 100644
--- a/test12/src/main/java/org/apache/shale/test/mock/lifecycle/ProcessValidationsExecutor.java
+++ b/test12/src/main/java/org/apache/myfaces/test/mock/lifecycle/ProcessValidationsExecutor.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shale.test.mock.lifecycle;
+package org.apache.myfaces.test.mock.lifecycle;
 
 import javax.faces.context.FacesContext;
 import javax.faces.event.PhaseId;
diff --git a/test12/src/main/java/org/apache/shale/test/mock/lifecycle/RenderResponseExecutor.java b/test12/src/main/java/org/apache/myfaces/test/mock/lifecycle/RenderResponseExecutor.java
similarity index 94%
rename from test12/src/main/java/org/apache/shale/test/mock/lifecycle/RenderResponseExecutor.java
rename to test12/src/main/java/org/apache/myfaces/test/mock/lifecycle/RenderResponseExecutor.java
index 7f6e701..d5bf206 100644
--- a/test12/src/main/java/org/apache/shale/test/mock/lifecycle/RenderResponseExecutor.java
+++ b/test12/src/main/java/org/apache/myfaces/test/mock/lifecycle/RenderResponseExecutor.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shale.test.mock.lifecycle;
+package org.apache.myfaces.test.mock.lifecycle;
 
 import java.io.IOException;
 
diff --git a/test12/src/main/java/org/apache/shale/test/mock/lifecycle/RestoreViewExecutor.java b/test12/src/main/java/org/apache/myfaces/test/mock/lifecycle/RestoreViewExecutor.java
similarity index 96%
rename from test12/src/main/java/org/apache/shale/test/mock/lifecycle/RestoreViewExecutor.java
rename to test12/src/main/java/org/apache/myfaces/test/mock/lifecycle/RestoreViewExecutor.java
index e36163a..b442c1c 100644
--- a/test12/src/main/java/org/apache/shale/test/mock/lifecycle/RestoreViewExecutor.java
+++ b/test12/src/main/java/org/apache/myfaces/test/mock/lifecycle/RestoreViewExecutor.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shale.test.mock.lifecycle;
+package org.apache.myfaces.test.mock.lifecycle;
 
 import javax.faces.FacesException;
 import javax.faces.application.Application;
diff --git a/test12/src/main/java/org/apache/shale/test/mock/lifecycle/RestoreViewSupport.java b/test12/src/main/java/org/apache/myfaces/test/mock/lifecycle/RestoreViewSupport.java
similarity index 95%
rename from test12/src/main/java/org/apache/shale/test/mock/lifecycle/RestoreViewSupport.java
rename to test12/src/main/java/org/apache/myfaces/test/mock/lifecycle/RestoreViewSupport.java
index b9562b6..613306e 100644
--- a/test12/src/main/java/org/apache/shale/test/mock/lifecycle/RestoreViewSupport.java
+++ b/test12/src/main/java/org/apache/myfaces/test/mock/lifecycle/RestoreViewSupport.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shale.test.mock.lifecycle;
+package org.apache.myfaces.test.mock.lifecycle;
 
 import javax.faces.FacesException;
 import javax.faces.component.UIComponent;
diff --git a/test12/src/main/java/org/apache/shale/test/mock/lifecycle/UpdateModelValuesExecutor.java b/test12/src/main/java/org/apache/myfaces/test/mock/lifecycle/UpdateModelValuesExecutor.java
similarity index 93%
rename from test12/src/main/java/org/apache/shale/test/mock/lifecycle/UpdateModelValuesExecutor.java
rename to test12/src/main/java/org/apache/myfaces/test/mock/lifecycle/UpdateModelValuesExecutor.java
index 35676be..a273f95 100644
--- a/test12/src/main/java/org/apache/shale/test/mock/lifecycle/UpdateModelValuesExecutor.java
+++ b/test12/src/main/java/org/apache/myfaces/test/mock/lifecycle/UpdateModelValuesExecutor.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shale.test.mock.lifecycle;
+package org.apache.myfaces.test.mock.lifecycle;
 
 import javax.faces.context.FacesContext;
 import javax.faces.event.PhaseId;
diff --git a/test12/src/test/java/org/apache/shale/test/config/ConfigParserTestCase.java b/test12/src/test/java/org/apache/myfaces/test/config/ConfigParserTestCase.java
similarity index 94%
rename from test12/src/test/java/org/apache/shale/test/config/ConfigParserTestCase.java
rename to test12/src/test/java/org/apache/myfaces/test/config/ConfigParserTestCase.java
index 885581b..03c8177 100644
--- a/test12/src/test/java/org/apache/shale/test/config/ConfigParserTestCase.java
+++ b/test12/src/test/java/org/apache/myfaces/test/config/ConfigParserTestCase.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shale.test.config;
+package org.apache.myfaces.test.config;
 
 import java.net.URL;
 import java.util.ArrayList;
@@ -25,7 +25,9 @@ import javax.faces.convert.Converter;
 import javax.faces.render.Renderer;
 import junit.framework.Test;
 import junit.framework.TestSuite;
-import org.apache.shale.test.base.AbstractJsfTestCase;
+
+import org.apache.myfaces.test.base.AbstractJsfTestCase;
+import org.apache.myfaces.test.config.ConfigParser;
 
 /**
  * <p>Unit tests for the configuration parser utility class.</p>
@@ -107,7 +109,7 @@ public class ConfigParserTestCase extends AbstractJsfTestCase {
     // Test loading a simple configuration resource
     public void testSimple() throws Exception {
 
-        URL url = this.getClass().getResource("/org/apache/shale/test/config/faces-config-1.xml");
+        URL url = this.getClass().getResource("/org/apache/myfaces/test/config/faces-config-1.xml");
         assertNotNull(url);
         parser.parse(url);
         Iterator items = null;
diff --git a/test12/src/test/java/org/apache/shale/test/config/MyConverter.java b/test12/src/test/java/org/apache/myfaces/test/config/MyConverter.java
similarity index 97%
rename from test12/src/test/java/org/apache/shale/test/config/MyConverter.java
rename to test12/src/test/java/org/apache/myfaces/test/config/MyConverter.java
index ed509f6..bf19f1e 100644
--- a/test12/src/test/java/org/apache/shale/test/config/MyConverter.java
+++ b/test12/src/test/java/org/apache/myfaces/test/config/MyConverter.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shale.test.config;
+package org.apache.myfaces.test.config;
 
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
diff --git a/test12/src/test/java/org/apache/shale/test/config/MyRenderer.java b/test12/src/test/java/org/apache/myfaces/test/config/MyRenderer.java
similarity index 95%
rename from test12/src/test/java/org/apache/shale/test/config/MyRenderer.java
rename to test12/src/test/java/org/apache/myfaces/test/config/MyRenderer.java
index 72f360a..20d6745 100644
--- a/test12/src/test/java/org/apache/shale/test/config/MyRenderer.java
+++ b/test12/src/test/java/org/apache/myfaces/test/config/MyRenderer.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shale.test.config;
+package org.apache.myfaces.test.config;
 
 import javax.faces.render.Renderer;
 
diff --git a/test12/src/test/java/org/apache/shale/test/el/MockExpressionFactoryTestCase.java b/test12/src/test/java/org/apache/myfaces/test/el/MockExpressionFactoryTestCase.java
similarity index 97%
rename from test12/src/test/java/org/apache/shale/test/el/MockExpressionFactoryTestCase.java
rename to test12/src/test/java/org/apache/myfaces/test/el/MockExpressionFactoryTestCase.java
index 92d5365..5d446e8 100644
--- a/test12/src/test/java/org/apache/shale/test/el/MockExpressionFactoryTestCase.java
+++ b/test12/src/test/java/org/apache/myfaces/test/el/MockExpressionFactoryTestCase.java
@@ -15,15 +15,17 @@
  * limitations under the License.
  */
 
-package org.apache.shale.test.el;
+package org.apache.myfaces.test.el;
 
 import javax.el.ELContext;
 import javax.el.PropertyNotWritableException;
 import javax.el.ValueExpression;
 import junit.framework.Test;
 import junit.framework.TestSuite;
-import org.apache.shale.test.base.AbstractJsfTestCase;
-import org.apache.shale.test.mock.MockApplication12;
+
+import org.apache.myfaces.test.base.AbstractJsfTestCase;
+import org.apache.myfaces.test.el.MockExpressionFactory;
+import org.apache.myfaces.test.mock.MockApplication12;
 
 /**
  * <p>Test case for <code>MockExpressionFactory.</p>
diff --git a/test12/src/test/java/org/apache/shale/test/mock/MockObjectsTestCase.java b/test12/src/test/java/org/apache/myfaces/test/mock/MockObjectsTestCase.java
similarity index 99%
rename from test12/src/test/java/org/apache/shale/test/mock/MockObjectsTestCase.java
rename to test12/src/test/java/org/apache/myfaces/test/mock/MockObjectsTestCase.java
index b279d31..c8755c7 100644
--- a/test12/src/test/java/org/apache/shale/test/mock/MockObjectsTestCase.java
+++ b/test12/src/test/java/org/apache/myfaces/test/mock/MockObjectsTestCase.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shale.test.mock;
+package org.apache.myfaces.test.mock;
 
 import javax.faces.el.MethodBinding;
 import javax.faces.el.ValueBinding;
@@ -23,7 +23,7 @@ import javax.faces.el.ValueBinding;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-import org.apache.shale.test.base.AbstractJsfTestCase;
+import org.apache.myfaces.test.base.AbstractJsfTestCase;
 
 /**
  * <p>Simple unit tests for Mock Objects that have behavior.</p>
diff --git a/test12/src/test/java/org/apache/shale/test/mock/TestMockBean.java b/test12/src/test/java/org/apache/myfaces/test/mock/TestMockBean.java
similarity index 97%
rename from test12/src/test/java/org/apache/shale/test/mock/TestMockBean.java
rename to test12/src/test/java/org/apache/myfaces/test/mock/TestMockBean.java
index ef8b5af..cd4acf5 100644
--- a/test12/src/test/java/org/apache/shale/test/mock/TestMockBean.java
+++ b/test12/src/test/java/org/apache/myfaces/test/mock/TestMockBean.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shale.test.mock;
+package org.apache.myfaces.test.mock;
 
 import java.io.Serializable;
 
diff --git a/test12/src/test/java/org/apache/shale/test/mock/ValueBindingTest.java b/test12/src/test/java/org/apache/myfaces/test/mock/ValueBindingTest.java
similarity index 93%
rename from test12/src/test/java/org/apache/shale/test/mock/ValueBindingTest.java
rename to test12/src/test/java/org/apache/myfaces/test/mock/ValueBindingTest.java
index 4d95887..ff49820 100644
--- a/test12/src/test/java/org/apache/shale/test/mock/ValueBindingTest.java
+++ b/test12/src/test/java/org/apache/myfaces/test/mock/ValueBindingTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.shale.test.mock;
+package org.apache.myfaces.test.mock;
 
 import java.io.IOException;
 
@@ -23,8 +23,8 @@ import javax.faces.el.ValueBinding;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-import org.apache.shale.test.base.AbstractJsfTestCase;
-import org.apache.shale.test.mock.data.Bean;
+import org.apache.myfaces.test.base.AbstractJsfTestCase;
+import org.apache.myfaces.test.mock.data.Bean;
 
 public class ValueBindingTest extends AbstractJsfTestCase
 {
diff --git a/test12/src/test/java/org/apache/shale/test/mock/data/Bean.java b/test12/src/test/java/org/apache/myfaces/test/mock/data/Bean.java
similarity index 96%
rename from test12/src/test/java/org/apache/shale/test/mock/data/Bean.java
rename to test12/src/test/java/org/apache/myfaces/test/mock/data/Bean.java
index 9a6b156..4df34b6 100644
--- a/test12/src/test/java/org/apache/shale/test/mock/data/Bean.java
+++ b/test12/src/test/java/org/apache/myfaces/test/mock/data/Bean.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.shale.test.mock.data;
+package org.apache.myfaces.test.mock.data;
 
 public class Bean
 {
diff --git a/test12/src/test/resources/org/apache/shale/test/config/faces-config-1.xml b/test12/src/test/resources/org/apache/myfaces/test/config/faces-config-1.xml
similarity index 89%
rename from test12/src/test/resources/org/apache/shale/test/config/faces-config-1.xml
rename to test12/src/test/resources/org/apache/myfaces/test/config/faces-config-1.xml
index fdd9b8c..9fc91f1 100644
--- a/test12/src/test/resources/org/apache/shale/test/config/faces-config-1.xml
+++ b/test12/src/test/resources/org/apache/myfaces/test/config/faces-config-1.xml
@@ -41,7 +41,7 @@
 
   <converter>
       <converter-for-class>java.lang.Integer</converter-for-class>
-      <converter-class>org.apache.shale.test.config.MyConverter</converter-class>
+      <converter-class>org.apache.myfaces.test.config.MyConverter</converter-class>
   </converter>
 
   <validator>
@@ -59,13 +59,13 @@
       <renderer>
           <component-family>component-family-1</component-family>
           <renderer-type>renderer-type-1</renderer-type>
-          <renderer-class>org.apache.shale.test.config.MyRenderer</renderer-class>
+          <renderer-class>org.apache.myfaces.test.config.MyRenderer</renderer-class>
       </renderer>
 
       <renderer>
           <component-family>component-family-2</component-family>
           <renderer-type>renderer-type-2</renderer-type>
-          <renderer-class>org.apache.shale.test.config.MyRenderer</renderer-class>
+          <renderer-class>org.apache.myfaces.test.config.MyRenderer</renderer-class>
       </renderer>
 
   </render-kit>
diff --git a/test20/src/main/java/org/apache/shale/test/mock/MockApplication20.java b/test20/src/main/java/org/apache/myfaces/test/mock/MockApplication20.java
similarity index 99%
rename from test20/src/main/java/org/apache/shale/test/mock/MockApplication20.java
rename to test20/src/main/java/org/apache/myfaces/test/mock/MockApplication20.java
index 8aa1d81..1c5e3bd 100644
--- a/test20/src/main/java/org/apache/shale/test/mock/MockApplication20.java
+++ b/test20/src/main/java/org/apache/myfaces/test/mock/MockApplication20.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shale.test.mock;
+package org.apache.myfaces.test.mock;
 
 import java.lang.reflect.Constructor;
 import java.util.HashMap;
diff --git a/test20/src/main/java/org/apache/shale/test/mock/MockApplicationFactory.java b/test20/src/main/java/org/apache/myfaces/test/mock/MockApplicationFactory.java
similarity index 93%
rename from test20/src/main/java/org/apache/shale/test/mock/MockApplicationFactory.java
rename to test20/src/main/java/org/apache/myfaces/test/mock/MockApplicationFactory.java
index 94a724a..8accc43 100644
--- a/test20/src/main/java/org/apache/shale/test/mock/MockApplicationFactory.java
+++ b/test20/src/main/java/org/apache/myfaces/test/mock/MockApplicationFactory.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shale.test.mock;
+package org.apache.myfaces.test.mock;
 
 import javax.faces.FacesException;
 import javax.faces.application.Application;
@@ -65,7 +65,7 @@ public class MockApplicationFactory extends ApplicationFactory {
             
             try {
                 clazz = this.getClass().getClassLoader().loadClass
-                  ("org.apache.shale.test.mock.MockApplication20");
+                  ("org.apache.myfaces.test.mock.MockApplication20");
                 this.application = (MockApplication) clazz.newInstance();
             } catch (NoClassDefFoundError e) {
                 clazz = null; // We are not running in a JSF 1.2 environment
@@ -81,7 +81,7 @@ public class MockApplicationFactory extends ApplicationFactory {
             {
                 try {
                     clazz = this.getClass().getClassLoader().loadClass
-                      ("org.apache.shale.test.mock.MockApplication12");
+                      ("org.apache.myfaces.test.mock.MockApplication12");
                     this.application = (MockApplication) clazz.newInstance();
                 } catch (NoClassDefFoundError e) {
                     clazz = null; // We are not running in a JSF 1.2 environment
@@ -96,7 +96,7 @@ public class MockApplicationFactory extends ApplicationFactory {
             if (clazz == null) {
                 try {
                     clazz = this.getClass().getClassLoader().loadClass
-                      ("org.apache.shale.test.mock.MockApplication");
+                      ("org.apache.myfaces.test.mock.MockApplication");
                     this.application = (MockApplication) clazz.newInstance();
                 } catch (RuntimeException e) {
                     throw e;
diff --git a/test20/src/main/java/org/apache/shale/test/mock/MockExternalContext20.java b/test20/src/main/java/org/apache/myfaces/test/mock/MockExternalContext20.java
similarity index 99%
rename from test20/src/main/java/org/apache/shale/test/mock/MockExternalContext20.java
rename to test20/src/main/java/org/apache/myfaces/test/mock/MockExternalContext20.java
index 5d05e84..fde1bf3 100644
--- a/test20/src/main/java/org/apache/shale/test/mock/MockExternalContext20.java
+++ b/test20/src/main/java/org/apache/myfaces/test/mock/MockExternalContext20.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shale.test.mock;
+package org.apache.myfaces.test.mock;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
diff --git a/test20/src/main/java/org/apache/shale/test/mock/MockFacesContext20.java b/test20/src/main/java/org/apache/myfaces/test/mock/MockFacesContext20.java
similarity index 98%
rename from test20/src/main/java/org/apache/shale/test/mock/MockFacesContext20.java
rename to test20/src/main/java/org/apache/myfaces/test/mock/MockFacesContext20.java
index b873dc8..7bb43b1 100644
--- a/test20/src/main/java/org/apache/shale/test/mock/MockFacesContext20.java
+++ b/test20/src/main/java/org/apache/myfaces/test/mock/MockFacesContext20.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shale.test.mock;
+package org.apache.myfaces.test.mock;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/test20/src/main/java/org/apache/shale/test/mock/MockFacesContextFactory.java b/test20/src/main/java/org/apache/myfaces/test/mock/MockFacesContextFactory.java
similarity index 95%
rename from test20/src/main/java/org/apache/shale/test/mock/MockFacesContextFactory.java
rename to test20/src/main/java/org/apache/myfaces/test/mock/MockFacesContextFactory.java
index 1a61532..246d19d 100644
--- a/test20/src/main/java/org/apache/shale/test/mock/MockFacesContextFactory.java
+++ b/test20/src/main/java/org/apache/myfaces/test/mock/MockFacesContextFactory.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shale.test.mock;
+package org.apache.myfaces.test.mock;
 
 import java.lang.reflect.Constructor;
 import javax.faces.FacesException;
@@ -49,7 +49,7 @@ public class MockFacesContextFactory extends FacesContextFactory {
 
         // Try to load the 2.0 version of our mock FacesContext class
         try {
-            clazz = this.getClass().getClassLoader().loadClass("org.apache.shale.test.mock.MockFacesContext20");
+            clazz = this.getClass().getClassLoader().loadClass("org.apache.myfaces.test.mock.MockFacesContext20");
             constructor = clazz.getConstructor(facesContextSignature);
             jsf20 = true;
         } catch (NoClassDefFoundError e) {
@@ -70,7 +70,7 @@ public class MockFacesContextFactory extends FacesContextFactory {
         try {
             if (clazz == null)
             {
-                clazz = this.getClass().getClassLoader().loadClass("org.apache.shale.test.mock.MockFacesContext12");
+                clazz = this.getClass().getClassLoader().loadClass("org.apache.myfaces.test.mock.MockFacesContext12");
                 constructor = clazz.getConstructor(facesContextSignature);
                 jsf12 = true;
             }
@@ -91,7 +91,7 @@ public class MockFacesContextFactory extends FacesContextFactory {
         // Fall back to the 1.1 version if we could not load the 1.2 version
         try {
             if (clazz == null) {
-                clazz = this.getClass().getClassLoader().loadClass("org.apache.shale.test.mock.MockFacesContext");
+                clazz = this.getClass().getClassLoader().loadClass("org.apache.myfaces.test.mock.MockFacesContext");
                 constructor = clazz.getConstructor(facesContextSignature);
                 jsf12 = false;
             }
@@ -157,7 +157,7 @@ public class MockFacesContextFactory extends FacesContextFactory {
         if (jsf20) {
             try {
                 clazz = this.getClass().getClassLoader().loadClass
-                  ("org.apache.shale.test.mock.MockExternalContext20");
+                  ("org.apache.myfaces.test.mock.MockExternalContext20");
             } catch (RuntimeException e) {
                 throw e;
             } catch (Exception e) {
@@ -168,7 +168,7 @@ public class MockFacesContextFactory extends FacesContextFactory {
         if (jsf12) {
             try {
                 clazz = this.getClass().getClassLoader().loadClass
-                  ("org.apache.shale.test.mock.MockExternalContext12");
+                  ("org.apache.myfaces.test.mock.MockExternalContext12");
             } catch (RuntimeException e) {
                 throw e;
             } catch (Exception e) {

-- 
To stop receiving notification emails like this one, please contact
deki@apache.org.

Mime
View raw message