Author: ekoneil
Date: Fri Jul 30 12:52:30 2004
New Revision: 31001
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/ExpressionEvaluator.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/ExpressionEvaluatorFactory.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/DataAccessProviderStack.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/ImplicitObjectBean.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/ExpressionEvaluatorImpl.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/NetUIReadVariableResolver.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/NetUIVariableResolver.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/ParsedExpression.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/ContextToken.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/IdentifierToken.java
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/databinding/expression/IndexedNameTest.java
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/AbstractExpressionTest.java
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/AccessTest.java
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/BundleScriptTest.java
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ExpressionTest.java
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/PageInputTest.java
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ParsedExpressionTest.java
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELCustomBindingContextTest.java
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELExpressionObjectTest.java
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELExpressionUpdateTest.java
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELPageInputTest.java
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELParsedExpressionTest.java
Log:
Test / EL cleanup.
Just removing dead imports which was making it harder to track who was using
what.
BB: self
DRT: NetUI pass
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/ExpressionEvaluator.java
==============================================================================
---
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/ExpressionEvaluator.java
(original)
+++
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/ExpressionEvaluator.java
Fri Jul 30 12:52:30 2004
@@ -39,7 +39,7 @@
* @param implicitObjects the set of contexts that may be used in
expression evaluation. This set
* is not necessarily complete as some objects that can be used as
top-level expression contexts
* may be contained within an object available in this JavaBean.
- * @throws ExcpressionEvaluationException when an error occurs
+ * @throws ExpressionEvaluationException when an error occurs
*/
public Object evaluateStrict(String expression, ImplicitObjectBean
implicitObjects)
throws ExpressionEvaluationException;
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/ExpressionEvaluatorFactory.java
==============================================================================
---
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/ExpressionEvaluatorFactory.java
(original)
+++
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/ExpressionEvaluatorFactory.java
Fri Jul 30 12:52:30 2004
@@ -19,13 +19,8 @@
package org.apache.beehive.netui.script;
// java imports
-import java.io.InputStream;
-
-import java.util.Enumeration;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.Map;
-import java.util.Properties;
// internal imports
import org.apache.beehive.netui.util.config.ConfigUtil;
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/DataAccessProviderStack.java
==============================================================================
---
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/DataAccessProviderStack.java
(original)
+++
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/DataAccessProviderStack.java
Fri Jul 30 12:52:30 2004
@@ -18,8 +18,8 @@
*/
package org.apache.beehive.netui.script.common;
-import javax.servlet.jsp.PageContext;
import java.util.Stack;
+import javax.servlet.jsp.PageContext;
public class DataAccessProviderStack
{
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/ImplicitObjectBean.java
==============================================================================
---
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/ImplicitObjectBean.java
(original)
+++
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/ImplicitObjectBean.java
Fri Jul 30 12:52:30 2004
@@ -20,17 +20,14 @@
// java imports
import java.util.ArrayList;
-import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import java.util.Set;
import javax.servlet.ServletContext;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import javax.servlet.jsp.PageContext;
import javax.servlet.jsp.tagext.Tag;
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/ExpressionEvaluatorImpl.java
==============================================================================
---
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/ExpressionEvaluatorImpl.java
(original)
+++
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/ExpressionEvaluatorImpl.java
Fri Jul 30 12:52:30 2004
@@ -19,12 +19,6 @@
package org.apache.beehive.netui.script.el;
// java imports
-import java.util.Map;
-
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.tagext.Tag;
// internal imports
import org.apache.beehive.netui.script.el.util.ParseUtils;
@@ -32,10 +26,8 @@
import org.apache.beehive.netui.script.Expression;
import org.apache.beehive.netui.script.ExpressionEvaluator;
import org.apache.beehive.netui.script.ExpressionEvaluationException;
-import org.apache.beehive.netui.script.ExpressionEvaluatorFactory;
import org.apache.beehive.netui.script.ExpressionUpdateException;
import org.apache.beehive.netui.script.IllegalExpressionException;
-import org.apache.beehive.netui.script.common.ImplicitObjectUtil;
import org.apache.beehive.netui.script.common.ImplicitObjectBean;
import org.apache.beehive.netui.util.logging.Logger;
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/NetUIReadVariableResolver.java
==============================================================================
---
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/NetUIReadVariableResolver.java
(original)
+++
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/NetUIReadVariableResolver.java
Fri Jul 30 12:52:30 2004
@@ -21,19 +21,11 @@
// java imports
import java.util.Map;
-import javax.servlet.ServletRequest;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import javax.servlet.jsp.PageContext;
import javax.servlet.jsp.tagext.Tag;
-import javax.servlet.jsp.el.ELException;
import javax.servlet.jsp.el.VariableResolver;
// internal imports
-import org.apache.beehive.netui.pageflow.GlobalApp;
-import org.apache.beehive.netui.pageflow.PageFlowController;
-import org.apache.beehive.netui.pageflow.PageFlowUtils;
-
import org.apache.beehive.netui.script.IllegalExpressionException;
import org.apache.beehive.netui.script.common.ImplicitObjectUtil;
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/NetUIVariableResolver.java
==============================================================================
---
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/NetUIVariableResolver.java
(original)
+++
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/NetUIVariableResolver.java
Fri Jul 30 12:52:30 2004
@@ -21,8 +21,6 @@
// java imports
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import javax.servlet.jsp.el.VariableResolver;
@@ -31,7 +29,6 @@
import org.apache.beehive.netui.pageflow.GlobalApp;
import org.apache.beehive.netui.pageflow.PageFlowController;
-import org.apache.beehive.netui.pageflow.PageFlowUtils;
import org.apache.beehive.netui.util.logging.Logger;
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/ParsedExpression.java
==============================================================================
---
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/ParsedExpression.java
(original)
+++
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/ParsedExpression.java
Fri Jul 30 12:52:30 2004
@@ -23,8 +23,6 @@
import java.util.List;
// internal imports
-import org.apache.beehive.netui.script.el.tokens.ExpressionToken;
-
import org.apache.beehive.netui.util.logging.Logger;
// external imports
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/ContextToken.java
==============================================================================
---
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/ContextToken.java
(original)
+++
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/ContextToken.java
Fri Jul 30 12:52:30 2004
@@ -18,8 +18,6 @@
*/
package org.apache.beehive.netui.script.el.tokens;
-import org.apache.beehive.netui.util.logging.Logger;
-
public class ContextToken
extends ExpressionToken
{
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/IdentifierToken.java
==============================================================================
---
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/IdentifierToken.java
(original)
+++
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/IdentifierToken.java
Fri Jul 30 12:52:30 2004
@@ -23,8 +23,6 @@
import java.util.Map;
// internal imports
-import org.apache.beehive.netui.script.el.util.ParseUtils;
-
import org.apache.beehive.netui.util.logging.Logger;
/**
Modified:
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/databinding/expression/IndexedNameTest.java
==============================================================================
---
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/databinding/expression/IndexedNameTest.java
(original)
+++
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/databinding/expression/IndexedNameTest.java
Fri Jul 30 12:52:30 2004
@@ -265,22 +265,12 @@
}
/**
- * Implementation for the NetUIEL from 8.1.2
+ *
*/
public static class NetUIELExpressionLanguage
extends ExpressionEngine
{
public NetUIELExpressionLanguage() {super("netuiel");}
- public String qualify(String expr) {return expr;}
- }
-
- /**
- * Implementation for WLW 8.1 GA, which only used XScript.
- */
- public static class XScriptExpressionLanguage
- extends ExpressionEngine
- {
- public XScriptExpressionLanguage() {super("xscript");}
public String qualify(String expr) {return expr;}
}
Modified:
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/AbstractExpressionTest.java
==============================================================================
---
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/AbstractExpressionTest.java
(original)
+++
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/AbstractExpressionTest.java
Fri Jul 30 12:52:30 2004
@@ -31,8 +31,6 @@
import org.apache.beehive.netui.test.servlet.ServletFactory;
import org.apache.beehive.netui.script.ExpressionEvaluator;
-import org.apache.beehive.netui.script.ExpressionEvaluatorFactory;
-
import org.apache.beehive.netui.script.common.ImplicitObjectUtil;
import org.apache.beehive.netui.script.common.ImplicitObjectBean;
Modified:
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/AccessTest.java
==============================================================================
---
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/AccessTest.java
(original)
+++
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/AccessTest.java
Fri Jul 30 12:52:30 2004
@@ -27,8 +27,6 @@
import org.apache.beehive.netui.test.beans.IProduct;
// external imports
-import junit.framework.Test;
-import junit.framework.TestSuite;
/**
* Unit tests for XScript expression parsing.
Modified:
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/BundleScriptTest.java
==============================================================================
---
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/BundleScriptTest.java
(original)
+++
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/BundleScriptTest.java
Fri Jul 30 12:52:30 2004
@@ -20,17 +20,13 @@
// java imports
import java.util.Locale;
+import javax.servlet.http.HttpServletRequest;
// internal imports
import org.apache.beehive.netui.script.common.BundleContext;
import org.apache.beehive.netui.script.common.BundleMap;
// external imports
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import javax.servlet.http.HttpServletRequest;
/**
*
Modified:
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ExpressionTest.java
==============================================================================
---
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ExpressionTest.java
(original)
+++
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ExpressionTest.java
Fri Jul 30 12:52:30 2004
@@ -30,8 +30,6 @@
import org.apache.beehive.netui.util.logging.Logger;
// external imports
-import junit.framework.Test;
-import junit.framework.TestSuite;
/**
* Unit tests for XScript expression parsing.
Modified:
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/PageInputTest.java
==============================================================================
---
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/PageInputTest.java
(original)
+++
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/PageInputTest.java
Fri Jul 30 12:52:30 2004
@@ -23,13 +23,9 @@
// internal imports
import org.apache.beehive.netui.pageflow.PageFlowUtils;
-
import org.apache.beehive.netui.util.logging.Logger;
// external imports
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
/**
*
Modified:
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ParsedExpressionTest.java
==============================================================================
---
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ParsedExpressionTest.java
(original)
+++
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ParsedExpressionTest.java
Fri Jul 30 12:52:30 2004
@@ -22,11 +22,8 @@
// internal imports
import org.apache.beehive.netui.script.Expression;
-import org.apache.beehive.netui.script.ExpressionEvaluationException;
// external imports
-import junit.framework.Test;
-import junit.framework.TestSuite;
/**
* Unit tests for XScript expression parsing.
Modified:
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELCustomBindingContextTest.java
==============================================================================
---
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELCustomBindingContextTest.java
(original)
+++
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELCustomBindingContextTest.java
Fri Jul 30 12:52:30 2004
@@ -29,12 +29,12 @@
import org.apache.beehive.netui.util.config.ConfigUtil;
-import com.bea.netuix.servlets.script.PortalVariableResolver.SkinBean;
-
// external imports
import junit.framework.Test;
import junit.framework.TestSuite;
+import com.bea.netuix.servlets.script.PortalVariableResolver;
+
/**
*
*/
@@ -51,7 +51,7 @@
InputStream is =
getClass().getClassLoader().getResourceAsStream("org/apache/beehive/netui/qa/util/netui-config.xml");
ConfigUtil.init(is);
- SkinBean skinBean = new SkinBean();
+ PortalVariableResolver.SkinBean skinBean = new
PortalVariableResolver.SkinBean();
Object result = evaluateExpression("{portal.skin.stringProperty}",
_fauxPageContext);
assertEquals(skinBean.getStringProperty(), result);
Modified:
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELExpressionObjectTest.java
==============================================================================
---
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELExpressionObjectTest.java
(original)
+++
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELExpressionObjectTest.java
Fri Jul 30 12:52:30 2004
@@ -24,9 +24,7 @@
// internal imports
import org.apache.beehive.netui.script.Expression;
import org.apache.beehive.netui.script.ExpressionEvaluator;
-
import org.apache.beehive.netui.script.el.ExpressionEvaluatorImpl;
-
import org.apache.beehive.netui.util.logging.Logger;
// external imports
Modified:
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELExpressionUpdateTest.java
==============================================================================
---
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELExpressionUpdateTest.java
(original)
+++
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELExpressionUpdateTest.java
Fri Jul 30 12:52:30 2004
@@ -22,7 +22,6 @@
// internal imports
import org.apache.beehive.netui.test.script.ExpressionUpdateTest;
-
import org.apache.beehive.netui.script.ExpressionEvaluator;
import org.apache.beehive.netui.script.ExpressionEvaluatorFactory;
Modified:
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELPageInputTest.java
==============================================================================
---
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELPageInputTest.java
(original)
+++
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELPageInputTest.java
Fri Jul 30 12:52:30 2004
@@ -22,7 +22,6 @@
// internal imports
import org.apache.beehive.netui.test.script.PageInputTest;
-
import org.apache.beehive.netui.script.ExpressionEvaluator;
import org.apache.beehive.netui.script.ExpressionEvaluatorFactory;
Modified:
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELParsedExpressionTest.java
==============================================================================
---
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELParsedExpressionTest.java
(original)
+++
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELParsedExpressionTest.java
Fri Jul 30 12:52:30 2004
@@ -22,7 +22,6 @@
// internal imports
import org.apache.beehive.netui.test.script.ParsedExpressionTest;
-
import org.apache.beehive.netui.script.ExpressionEvaluator;
import org.apache.beehive.netui.script.ExpressionEvaluatorFactory;
