You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2009/11/24 23:31:18 UTC
svn commit: r883901 [2/2] - in /myfaces/test/trunk:
test12/src/main/java/org/apache/myfaces/
test12/src/main/java/org/apache/myfaces/test/
test12/src/main/java/org/apache/myfaces/test/base/
test12/src/main/java/org/apache/myfaces/test/cargo/ test12/src...
Modified: myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/lifecycle/PhaseListenerManager.java
URL: http://svn.apache.org/viewvc/myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/lifecycle/PhaseListenerManager.java?rev=883901&r1=883891&r2=883901&view=diff
==============================================================================
--- myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/lifecycle/PhaseListenerManager.java (original)
+++ myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/lifecycle/PhaseListenerManager.java Tue Nov 24 22:31:13 2009
@@ -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;
Modified: myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/lifecycle/ProcessValidationsExecutor.java
URL: http://svn.apache.org/viewvc/myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/lifecycle/ProcessValidationsExecutor.java?rev=883901&r1=883891&r2=883901&view=diff
==============================================================================
--- myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/lifecycle/ProcessValidationsExecutor.java (original)
+++ myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/lifecycle/ProcessValidationsExecutor.java Tue Nov 24 22:31:13 2009
@@ -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;
Modified: myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/lifecycle/RenderResponseExecutor.java
URL: http://svn.apache.org/viewvc/myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/lifecycle/RenderResponseExecutor.java?rev=883901&r1=883891&r2=883901&view=diff
==============================================================================
--- myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/lifecycle/RenderResponseExecutor.java (original)
+++ myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/lifecycle/RenderResponseExecutor.java Tue Nov 24 22:31:13 2009
@@ -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;
Modified: myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/lifecycle/RestoreViewExecutor.java
URL: http://svn.apache.org/viewvc/myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/lifecycle/RestoreViewExecutor.java?rev=883901&r1=883891&r2=883901&view=diff
==============================================================================
--- myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/lifecycle/RestoreViewExecutor.java (original)
+++ myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/lifecycle/RestoreViewExecutor.java Tue Nov 24 22:31:13 2009
@@ -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;
Modified: myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/lifecycle/RestoreViewSupport.java
URL: http://svn.apache.org/viewvc/myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/lifecycle/RestoreViewSupport.java?rev=883901&r1=883891&r2=883901&view=diff
==============================================================================
--- myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/lifecycle/RestoreViewSupport.java (original)
+++ myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/lifecycle/RestoreViewSupport.java Tue Nov 24 22:31:13 2009
@@ -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;
Modified: myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/lifecycle/UpdateModelValuesExecutor.java
URL: http://svn.apache.org/viewvc/myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/lifecycle/UpdateModelValuesExecutor.java?rev=883901&r1=883891&r2=883901&view=diff
==============================================================================
--- myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/lifecycle/UpdateModelValuesExecutor.java (original)
+++ myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/lifecycle/UpdateModelValuesExecutor.java Tue Nov 24 22:31:13 2009
@@ -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;
Modified: myfaces/test/trunk/test12/src/test/java/org/apache/myfaces/test/config/ConfigParserTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/test/trunk/test12/src/test/java/org/apache/myfaces/test/config/ConfigParserTestCase.java?rev=883901&r1=828850&r2=883901&view=diff
==============================================================================
--- myfaces/test/trunk/test12/src/test/java/org/apache/myfaces/test/config/ConfigParserTestCase.java (original)
+++ myfaces/test/trunk/test12/src/test/java/org/apache/myfaces/test/config/ConfigParserTestCase.java Tue Nov 24 22:31:13 2009
@@ -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.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 @@
// 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;
Modified: myfaces/test/trunk/test12/src/test/java/org/apache/myfaces/test/config/MyConverter.java
URL: http://svn.apache.org/viewvc/myfaces/test/trunk/test12/src/test/java/org/apache/myfaces/test/config/MyConverter.java?rev=883901&r1=828850&r2=883901&view=diff
==============================================================================
--- myfaces/test/trunk/test12/src/test/java/org/apache/myfaces/test/config/MyConverter.java (original)
+++ myfaces/test/trunk/test12/src/test/java/org/apache/myfaces/test/config/MyConverter.java Tue Nov 24 22:31:13 2009
@@ -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;
Modified: myfaces/test/trunk/test12/src/test/java/org/apache/myfaces/test/config/MyRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/test/trunk/test12/src/test/java/org/apache/myfaces/test/config/MyRenderer.java?rev=883901&r1=828850&r2=883901&view=diff
==============================================================================
--- myfaces/test/trunk/test12/src/test/java/org/apache/myfaces/test/config/MyRenderer.java (original)
+++ myfaces/test/trunk/test12/src/test/java/org/apache/myfaces/test/config/MyRenderer.java Tue Nov 24 22:31:13 2009
@@ -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;
Modified: myfaces/test/trunk/test12/src/test/java/org/apache/myfaces/test/el/MockExpressionFactoryTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/test/trunk/test12/src/test/java/org/apache/myfaces/test/el/MockExpressionFactoryTestCase.java?rev=883901&r1=828850&r2=883901&view=diff
==============================================================================
--- myfaces/test/trunk/test12/src/test/java/org/apache/myfaces/test/el/MockExpressionFactoryTestCase.java (original)
+++ myfaces/test/trunk/test12/src/test/java/org/apache/myfaces/test/el/MockExpressionFactoryTestCase.java Tue Nov 24 22:31:13 2009
@@ -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>
Copied: myfaces/test/trunk/test12/src/test/java/org/apache/myfaces/test/mock/MockObjectsTestCase.java (from r828850, myfaces/test/trunk/test12/src/test/java/org/apache/shale/test/mock/MockObjectsTestCase.java)
URL: http://svn.apache.org/viewvc/myfaces/test/trunk/test12/src/test/java/org/apache/myfaces/test/mock/MockObjectsTestCase.java?p2=myfaces/test/trunk/test12/src/test/java/org/apache/myfaces/test/mock/MockObjectsTestCase.java&p1=myfaces/test/trunk/test12/src/test/java/org/apache/shale/test/mock/MockObjectsTestCase.java&r1=828850&r2=883901&rev=883901&view=diff
==============================================================================
--- myfaces/test/trunk/test12/src/test/java/org/apache/shale/test/mock/MockObjectsTestCase.java (original)
+++ myfaces/test/trunk/test12/src/test/java/org/apache/myfaces/test/mock/MockObjectsTestCase.java Tue Nov 24 22:31:13 2009
@@ -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 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>
Copied: myfaces/test/trunk/test12/src/test/java/org/apache/myfaces/test/mock/TestMockBean.java (from r828850, myfaces/test/trunk/test12/src/test/java/org/apache/shale/test/mock/TestMockBean.java)
URL: http://svn.apache.org/viewvc/myfaces/test/trunk/test12/src/test/java/org/apache/myfaces/test/mock/TestMockBean.java?p2=myfaces/test/trunk/test12/src/test/java/org/apache/myfaces/test/mock/TestMockBean.java&p1=myfaces/test/trunk/test12/src/test/java/org/apache/shale/test/mock/TestMockBean.java&r1=828850&r2=883901&rev=883901&view=diff
==============================================================================
--- myfaces/test/trunk/test12/src/test/java/org/apache/shale/test/mock/TestMockBean.java (original)
+++ myfaces/test/trunk/test12/src/test/java/org/apache/myfaces/test/mock/TestMockBean.java Tue Nov 24 22:31:13 2009
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shale.test.mock;
+package org.apache.myfaces.test.mock;
import java.io.Serializable;
Copied: myfaces/test/trunk/test12/src/test/java/org/apache/myfaces/test/mock/ValueBindingTest.java (from r828850, myfaces/test/trunk/test12/src/test/java/org/apache/shale/test/mock/ValueBindingTest.java)
URL: http://svn.apache.org/viewvc/myfaces/test/trunk/test12/src/test/java/org/apache/myfaces/test/mock/ValueBindingTest.java?p2=myfaces/test/trunk/test12/src/test/java/org/apache/myfaces/test/mock/ValueBindingTest.java&p1=myfaces/test/trunk/test12/src/test/java/org/apache/shale/test/mock/ValueBindingTest.java&r1=828850&r2=883901&rev=883901&view=diff
==============================================================================
--- myfaces/test/trunk/test12/src/test/java/org/apache/shale/test/mock/ValueBindingTest.java (original)
+++ myfaces/test/trunk/test12/src/test/java/org/apache/myfaces/test/mock/ValueBindingTest.java Tue Nov 24 22:31:13 2009
@@ -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 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
{
Modified: myfaces/test/trunk/test12/src/test/java/org/apache/myfaces/test/mock/data/Bean.java
URL: http://svn.apache.org/viewvc/myfaces/test/trunk/test12/src/test/java/org/apache/myfaces/test/mock/data/Bean.java?rev=883901&r1=828850&r2=883901&view=diff
==============================================================================
--- myfaces/test/trunk/test12/src/test/java/org/apache/myfaces/test/mock/data/Bean.java (original)
+++ myfaces/test/trunk/test12/src/test/java/org/apache/myfaces/test/mock/data/Bean.java Tue Nov 24 22:31:13 2009
@@ -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
{
Modified: myfaces/test/trunk/test12/src/test/resources/org/apache/myfaces/test/config/faces-config-1.xml
URL: http://svn.apache.org/viewvc/myfaces/test/trunk/test12/src/test/resources/org/apache/myfaces/test/config/faces-config-1.xml?rev=883901&r1=828850&r2=883901&view=diff
==============================================================================
--- myfaces/test/trunk/test12/src/test/resources/org/apache/myfaces/test/config/faces-config-1.xml (original)
+++ myfaces/test/trunk/test12/src/test/resources/org/apache/myfaces/test/config/faces-config-1.xml Tue Nov 24 22:31:13 2009
@@ -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>
Modified: myfaces/test/trunk/test20/src/main/java/org/apache/myfaces/test/mock/MockApplication20.java
URL: http://svn.apache.org/viewvc/myfaces/test/trunk/test20/src/main/java/org/apache/myfaces/test/mock/MockApplication20.java?rev=883901&r1=883899&r2=883901&view=diff
==============================================================================
--- myfaces/test/trunk/test20/src/main/java/org/apache/myfaces/test/mock/MockApplication20.java (original)
+++ myfaces/test/trunk/test20/src/main/java/org/apache/myfaces/test/mock/MockApplication20.java Tue Nov 24 22:31:13 2009
@@ -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;
Modified: myfaces/test/trunk/test20/src/main/java/org/apache/myfaces/test/mock/MockApplicationFactory.java
URL: http://svn.apache.org/viewvc/myfaces/test/trunk/test20/src/main/java/org/apache/myfaces/test/mock/MockApplicationFactory.java?rev=883901&r1=883899&r2=883901&view=diff
==============================================================================
--- myfaces/test/trunk/test20/src/main/java/org/apache/myfaces/test/mock/MockApplicationFactory.java (original)
+++ myfaces/test/trunk/test20/src/main/java/org/apache/myfaces/test/mock/MockApplicationFactory.java Tue Nov 24 22:31:13 2009
@@ -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 @@
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 @@
{
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 @@
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;
Modified: myfaces/test/trunk/test20/src/main/java/org/apache/myfaces/test/mock/MockExternalContext20.java
URL: http://svn.apache.org/viewvc/myfaces/test/trunk/test20/src/main/java/org/apache/myfaces/test/mock/MockExternalContext20.java?rev=883901&r1=883899&r2=883901&view=diff
==============================================================================
--- myfaces/test/trunk/test20/src/main/java/org/apache/myfaces/test/mock/MockExternalContext20.java (original)
+++ myfaces/test/trunk/test20/src/main/java/org/apache/myfaces/test/mock/MockExternalContext20.java Tue Nov 24 22:31:13 2009
@@ -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;
Modified: myfaces/test/trunk/test20/src/main/java/org/apache/myfaces/test/mock/MockFacesContext20.java
URL: http://svn.apache.org/viewvc/myfaces/test/trunk/test20/src/main/java/org/apache/myfaces/test/mock/MockFacesContext20.java?rev=883901&r1=883899&r2=883901&view=diff
==============================================================================
--- myfaces/test/trunk/test20/src/main/java/org/apache/myfaces/test/mock/MockFacesContext20.java (original)
+++ myfaces/test/trunk/test20/src/main/java/org/apache/myfaces/test/mock/MockFacesContext20.java Tue Nov 24 22:31:13 2009
@@ -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;
Modified: myfaces/test/trunk/test20/src/main/java/org/apache/myfaces/test/mock/MockFacesContextFactory.java
URL: http://svn.apache.org/viewvc/myfaces/test/trunk/test20/src/main/java/org/apache/myfaces/test/mock/MockFacesContextFactory.java?rev=883901&r1=883899&r2=883901&view=diff
==============================================================================
--- myfaces/test/trunk/test20/src/main/java/org/apache/myfaces/test/mock/MockFacesContextFactory.java (original)
+++ myfaces/test/trunk/test20/src/main/java/org/apache/myfaces/test/mock/MockFacesContextFactory.java Tue Nov 24 22:31:13 2009
@@ -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 @@
// 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 @@
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 @@
// 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 @@
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 @@
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) {