You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shale.apache.org by cr...@apache.org on 2006/10/08 02:19:15 UTC
svn commit: r454046 - in /shale/framework/trunk/shale-test/src/main/java/org/apache/shale/test: el/ mock/

Author: craigmcc
Date: Sat Oct  7 17:19:14 2006
New Revision: 454046

URL: http://svn.apache.org/viewvc?view=rev&rev=454046
Log:
Refactor all of the unified EL support classes into the same package.

SHALE-304

Added:
    shale/framework/trunk/shale-test/src/main/java/org/apache/shale/test/el/MockELContext.java
      - copied, changed from r454044, shale/framework/trunk/shale-test/src/main/java/org/apache/shale/test/mock/MockELContext.java
    shale/framework/trunk/shale-test/src/main/java/org/apache/shale/test/el/MockExpressionFactory.java
      - copied, changed from r454044, shale/framework/trunk/shale-test/src/main/java/org/apache/shale/test/mock/MockExpressionFactory.java
    shale/framework/trunk/shale-test/src/main/java/org/apache/shale/test/el/MockFunctionMapper.java
      - copied, changed from r454044, shale/framework/trunk/shale-test/src/main/java/org/apache/shale/test/mock/MockFunctionMapper.java
    shale/framework/trunk/shale-test/src/main/java/org/apache/shale/test/el/MockVariableMapper.java
      - copied, changed from r454044, shale/framework/trunk/shale-test/src/main/java/org/apache/shale/test/mock/MockVariableMapper.java
    shale/framework/trunk/shale-test/src/main/java/org/apache/shale/test/el/package.html   (with props)
Removed:
    shale/framework/trunk/shale-test/src/main/java/org/apache/shale/test/mock/MockELContext.java
    shale/framework/trunk/shale-test/src/main/java/org/apache/shale/test/mock/MockExpressionFactory.java
    shale/framework/trunk/shale-test/src/main/java/org/apache/shale/test/mock/MockFunctionMapper.java
    shale/framework/trunk/shale-test/src/main/java/org/apache/shale/test/mock/MockVariableMapper.java
Modified:
    shale/framework/trunk/shale-test/src/main/java/org/apache/shale/test/mock/MockApplication12.java
    shale/framework/trunk/shale-test/src/main/java/org/apache/shale/test/mock/MockFacesContext12.java

Copied: shale/framework/trunk/shale-test/src/main/java/org/apache/shale/test/el/MockELContext.java (from r454044, shale/framework/trunk/shale-test/src/main/java/org/apache/shale/test/mock/MockELContext.java)
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-test/src/main/java/org/apache/shale/test/el/MockELContext.java?view=diff&rev=454046&p1=shale/framework/trunk/shale-test/src/main/java/org/apache/shale/test/mock/MockELContext.java&r1=454044&p2=shale/framework/trunk/shale-test/src/main/java/org/apache/shale/test/el/MockELContext.java&r2=454046
==============================================================================
--- shale/framework/trunk/shale-test/src/main/java/org/apache/shale/test/mock/MockELContext.java (original)
+++ shale/framework/trunk/shale-test/src/main/java/org/apache/shale/test/el/MockELContext.java Sat Oct  7 17:19:14 2006
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.shale.test.mock;
+package org.apache.shale.test.el;
 
 import java.util.HashMap;
 import java.util.Locale;
@@ -27,8 +27,6 @@
 
 /**
  * <p>Mock implementation of <code>ELContext</code>.</p>
- *
- * $Id$
  *
  * @since 1.0.4
  */

Copied: shale/framework/trunk/shale-test/src/main/java/org/apache/shale/test/el/MockExpressionFactory.java (from r454044, shale/framework/trunk/shale-test/src/main/java/org/apache/shale/test/mock/MockExpressionFactory.java)
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-test/src/main/java/org/apache/shale/test/el/MockExpressionFactory.java?view=diff&rev=454046&p1=shale/framework/trunk/shale-test/src/main/java/org/apache/shale/test/mock/MockExpressionFactory.java&r1=454044&p2=shale/framework/trunk/shale-test/src/main/java/org/apache/shale/test/el/MockExpressionFactory.java&r2=454046
==============================================================================
--- shale/framework/trunk/shale-test/src/main/java/org/apache/shale/test/mock/MockExpressionFactory.java (original)
+++ shale/framework/trunk/shale-test/src/main/java/org/apache/shale/test/el/MockExpressionFactory.java Sat Oct  7 17:19:14 2006
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.shale.test.mock;
+package org.apache.shale.test.el;
 
 import javax.el.ELContext;
 import javax.el.ExpressionFactory;

Copied: shale/framework/trunk/shale-test/src/main/java/org/apache/shale/test/el/MockFunctionMapper.java (from r454044, shale/framework/trunk/shale-test/src/main/java/org/apache/shale/test/mock/MockFunctionMapper.java)
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-test/src/main/java/org/apache/shale/test/el/MockFunctionMapper.java?view=diff&rev=454046&p1=shale/framework/trunk/shale-test/src/main/java/org/apache/shale/test/mock/MockFunctionMapper.java&r1=454044&p2=shale/framework/trunk/shale-test/src/main/java/org/apache/shale/test/el/MockFunctionMapper.java&r2=454046
==============================================================================
--- shale/framework/trunk/shale-test/src/main/java/org/apache/shale/test/mock/MockFunctionMapper.java (original)
+++ shale/framework/trunk/shale-test/src/main/java/org/apache/shale/test/el/MockFunctionMapper.java Sat Oct  7 17:19:14 2006
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.shale.test.mock;
+package org.apache.shale.test.el;
 
 import java.lang.reflect.Method;
 import java.util.HashMap;
@@ -23,8 +23,6 @@
 
 /**
  * <p>Mock implementation of <code>FunctionMapper</code>.</p>
- *
- * $Id$
  *
  * @since 1.0.4
  */

Copied: shale/framework/trunk/shale-test/src/main/java/org/apache/shale/test/el/MockVariableMapper.java (from r454044, shale/framework/trunk/shale-test/src/main/java/org/apache/shale/test/mock/MockVariableMapper.java)
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-test/src/main/java/org/apache/shale/test/el/MockVariableMapper.java?view=diff&rev=454046&p1=shale/framework/trunk/shale-test/src/main/java/org/apache/shale/test/mock/MockVariableMapper.java&r1=454044&p2=shale/framework/trunk/shale-test/src/main/java/org/apache/shale/test/el/MockVariableMapper.java&r2=454046
==============================================================================
--- shale/framework/trunk/shale-test/src/main/java/org/apache/shale/test/mock/MockVariableMapper.java (original)
+++ shale/framework/trunk/shale-test/src/main/java/org/apache/shale/test/el/MockVariableMapper.java Sat Oct  7 17:19:14 2006
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.shale.test.mock;
+package org.apache.shale.test.el;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -23,8 +23,6 @@
 
 /**
  * <p>Mock implementation of <code>VariableMapper</code>.</p>
- *
- * $Id$
  *
  * @since 1.0.4
  */

Added: shale/framework/trunk/shale-test/src/main/java/org/apache/shale/test/el/package.html
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-test/src/main/java/org/apache/shale/test/el/package.html?view=auto&rev=454046
==============================================================================
--- shale/framework/trunk/shale-test/src/main/java/org/apache/shale/test/el/package.html (added)
+++ shale/framework/trunk/shale-test/src/main/java/org/apache/shale/test/el/package.html Sat Oct  7 17:19:14 2006
@@ -0,0 +1,5 @@
+<body>
+    <p>This package contains mock objects and supporting infrastructure
+    for expression evaluation using the Unified EL APIs.  These classes
+    are only relevant when running in a JSF 1.2 environment.</p>
+</body>
\ No newline at end of file

Propchange: shale/framework/trunk/shale-test/src/main/java/org/apache/shale/test/el/package.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shale/framework/trunk/shale-test/src/main/java/org/apache/shale/test/el/package.html
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: shale/framework/trunk/shale-test/src/main/java/org/apache/shale/test/mock/MockApplication12.java
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-test/src/main/java/org/apache/shale/test/mock/MockApplication12.java?view=diff&rev=454046&r1=454045&r2=454046
==============================================================================
--- shale/framework/trunk/shale-test/src/main/java/org/apache/shale/test/mock/MockApplication12.java (original)
+++ shale/framework/trunk/shale-test/src/main/java/org/apache/shale/test/mock/MockApplication12.java Sat Oct  7 17:19:14 2006
@@ -42,6 +42,7 @@
 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;
 
 /**
  * <p>Mock implementation of <code>ExternalContext</code> that includes the semantics

Modified: shale/framework/trunk/shale-test/src/main/java/org/apache/shale/test/mock/MockFacesContext12.java
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-test/src/main/java/org/apache/shale/test/mock/MockFacesContext12.java?view=diff&rev=454046&r1=454045&r2=454046
==============================================================================
--- shale/framework/trunk/shale-test/src/main/java/org/apache/shale/test/mock/MockFacesContext12.java (original)
+++ shale/framework/trunk/shale-test/src/main/java/org/apache/shale/test/mock/MockFacesContext12.java Sat Oct  7 17:19:14 2006
@@ -22,6 +22,7 @@
 import javax.faces.context.ExternalContext;
 import javax.faces.context.FacesContext;
 import javax.faces.lifecycle.Lifecycle;
+import org.apache.shale.test.el.MockELContext;
 
 /**
  * <p>Mock implementation of <code>FacesContext</code> that includes the semantics