Author: ekoneil
Date: Sun Jan 30 10:16:28 2005
New Revision: 149129
URL: http://svn.apache.org/viewcvs?view=rev&rev=149129
Log:
Prune unused code from the expression language config.
Move the netui-config XSD down a directory to match the structure of the url
config XSD.
BB: self
DRT: Beehive pass
BVT: NetUI pass
Added:
incubator/beehive/trunk/netui/src/util/schema/netui-config/
incubator/beehive/trunk/netui/src/util/schema/netui-config/config.xsdconfig
- copied unchanged from r149122,
incubator/beehive/trunk/netui/src/util/schema/config.xsdconfig
incubator/beehive/trunk/netui/src/util/schema/netui-config/netui-config.xsd
- copied unchanged from r149122,
incubator/beehive/trunk/netui/src/util/schema/netui-config.xsd
Removed:
incubator/beehive/trunk/netui/src/util/schema/config.xsdconfig
incubator/beehive/trunk/netui/src/util/schema/netui-config.xsd
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/ImplicitObjectUtil.java
incubator/beehive/trunk/netui/src/util/build.xml
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/ImplicitObjectUtil.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/ImplicitObjectUtil.java?view=diff&rev=149129&p1=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/ImplicitObjectUtil.java&r1=149128&p2=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/ImplicitObjectUtil.java&r2=149129
==============================================================================
---
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/ImplicitObjectUtil.java
(original)
+++
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/ImplicitObjectUtil.java
Sun Jan 30 10:16:28 2005
@@ -17,8 +17,6 @@
*/
package org.apache.beehive.netui.script.common;
-import java.util.LinkedHashMap;
-import java.util.Iterator;
import java.util.Map;
import java.util.Collections;
import javax.servlet.ServletRequest;
@@ -38,13 +36,8 @@
import org.apache.beehive.netui.pageflow.internal.AnyBeanActionForm;
import org.apache.beehive.netui.pageflow.internal.InternalUtils;
import org.apache.beehive.netui.pageflow.internal.FacesBackingBeanFactory;
-import org.apache.beehive.netui.util.config.ConfigUtil;
-import
org.apache.beehive.netui.util.config.bean.NetuiConfigDocument.NetuiConfig;
-import org.apache.beehive.netui.util.config.bean.ExpressionLanguages;
-import
org.apache.beehive.netui.util.config.bean.ExpressionLanguages.ExpressionLanguage;
-import org.apache.beehive.netui.util.config.bean.BindingContexts;
-import org.apache.beehive.netui.util.logging.Logger;
import org.apache.beehive.netui.script.el.NetUIUpdateVariableResolver;
+import org.apache.beehive.netui.util.logging.Logger;
/**
*
@@ -52,6 +45,7 @@
public class ImplicitObjectUtil {
private static final Logger LOGGER =
Logger.getInstance(ImplicitObjectUtil.class);
+
private static final String PAGE_FLOW_IMPLICIT_OBJECT_KEY = "pageFlow";
private static final String SHARED_FLOW_IMPLICIT_OBJECT_KEY = "sharedFlow";
private static final String GLOBAL_APP_IMPLICIT_OBJECT_KEY = "globalApp";
@@ -61,8 +55,8 @@
private static final String ACTION_FORM_IMPLICIT_OBJECT_KEY = "actionForm";
private static final String OUTPUT_FORM_BEAN_OBJECT_KEY = "outputFormBean";
- private ImplicitObjectUtil() {
- }
+ /* do not construct */
+ private ImplicitObjectUtil() {}
public static final void loadActionForm(JspContext jspContext, Object
form) {
jspContext.setAttribute(ACTION_FORM_IMPLICIT_OBJECT_KEY,
unwrapForm(form));
@@ -142,26 +136,6 @@
}
/**
- * Lookup an implicit object given an implicit object name.
- *
- * @throws RuntimeException if a factory for the given context name could
not be resolved
- */
- public static final Object getImplicitObject(Map factories,
VariableResolver vr, String name) {
- assert factories != null;
-
- ContextFactory factory = (ContextFactory)factories.get(name);
-
- if(factory == null) {
- // @todo: i18n
- String msg = "Could not resolve ContextFactory for binding context
named \"" + name + "\"";
- if(LOGGER.isErrorEnabled()) LOGGER.error(msg);
- throw new RuntimeException(msg);
- }
-
- return factory.getInstance(vr);
- }
-
- /**
*
*/
public static final VariableResolver
getUpdateVariableResolver(ServletRequest request, ServletResponse response,
boolean isHandlingPost) {
@@ -183,86 +157,7 @@
return pageContext.getVariableResolver();
}
- /**
- * Read entires from the netui-config.xml file and add the objects
- * to this implicit object map.
- */
- public static final Map initialize(String languageName) {
- NetuiConfig netuiConfig = ConfigUtil.getConfig();
- if(netuiConfig == null) return null;
- ExpressionLanguages languages = netuiConfig.getExpressionLanguages();
- if(languages == null) return null;
- ExpressionLanguage[] langArray =
languages.getExpressionLanguageArray();
- if(langArray == null) return null;
- ExpressionLanguage language = null;
- for(int i = 0; i < langArray.length; i++) {
- if(langArray[i].getName().equals(languageName))
- language = langArray[i];
- }
- if(language == null) return null;
-
- Map config = readFromConfig(language);
-
- // likely didn't find the config file
- if(config == null) return null;
-
- LinkedHashMap map = new LinkedHashMap();
- ContextFactory factory = null;
- Iterator iterator = config.keySet().iterator();
- while(iterator.hasNext()) {
- String name = (String)iterator.next();
- String className = (String)config.get(name);
-
- // try to find the ContextFactory implementation
- try {
- // @todo: need to use a context classloader here
- Class type = Class.forName(className);
- factory = (ContextFactory)type.newInstance();
- } catch(ClassNotFoundException cnf) {
- if(LOGGER.isWarnEnabled())
- LOGGER.warn("Could not create a ContextFactory for type
\"" + className + "\" because the ContextFactory implementation class could not
be found.");
-
- continue;
- } catch(Exception ex) {
- if(LOGGER.isWarnEnabled())
- LOGGER.warn("Could not create a ContextFactory for type
\"" + className +
- "\" because an error occurred creating the factory.
Cause: " + ex, ex);
- continue;
- }
-
- if(map.containsKey(name)) {
- if(LOGGER.isWarnEnabled())
- LOGGER.warn("Overwriting a previously defined
ContextFactory named \"" + name +
- "\" with a new ContextFactory of type \"" + className
+ "\"");
- } else {
- if(LOGGER.isInfoEnabled())
- LOGGER.info("Adding a ContextFactory named \"" + name +
"\" with implementation \"" + className + "\"");
- }
-
- map.put(name, factory);
- }
-
- return map;
- }
-
- private static final Map readFromConfig(ExpressionLanguage language) {
- assert language != null;
-
- BindingContexts contexts = language.getBindingContexts();
- if(contexts == null) return null;
-
-
org.apache.beehive.netui.util.config.bean.BindingContexts.BindingContext[]
array = contexts.getBindingContextArray();
- if(array == null) return null;
-
- LinkedHashMap map = new LinkedHashMap();
- for(int i = 0; i < array.length; i++) {
- map.put(array[i].getName(), array[i].getFactoryClass());
- }
-
- return map;
- }
-
- public static void loadImplicitObjects(HttpServletRequest request,
HttpServletResponse response, ServletContext servletContext, PageFlowController
curJpf) {
+ public static final void loadImplicitObjects(HttpServletRequest request,
HttpServletResponse response, ServletContext servletContext, PageFlowController
curJpf) {
// @todo: need to wrap this in checks for JSP 1.2
// @todo: feature: need to add support for chaining in user-code to
run when setting implicit objects on the request
if(curJpf != null) {
Modified: incubator/beehive/trunk/netui/src/util/build.xml
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/util/build.xml?view=diff&rev=149129&p1=incubator/beehive/trunk/netui/src/util/build.xml&r1=149128&p2=incubator/beehive/trunk/netui/src/util/build.xml&r2=149129
==============================================================================
--- incubator/beehive/trunk/netui/src/util/build.xml (original)
+++ incubator/beehive/trunk/netui/src/util/build.xml Sun Jan 30 10:16:28 2005
@@ -26,7 +26,7 @@
<ant antfile="${netui.ant.dir}/xmlBean.xml">
<property name="xsd.root.dir" value="${module.dir}/schema/"/>
<property name="class.output.dir"
value="${classes.dir}/${module.name}"/>
- <property name="xbean.inputs" value="${module.dir}/schema/*.xsd*"/>
+ <property name="xbean.inputs"
value="${module.dir}/schema/netui-config/.xsd*"/>
<property name="xbean.output"
value="${build.lib.dir}/${util.jar.name}"/>
</ant>
Deleted: /incubator/beehive/trunk/netui/src/util/schema/config.xsdconfig
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/util/schema/config.xsdconfig?view=auto&rev=149128
==============================================================================
Deleted: /incubator/beehive/trunk/netui/src/util/schema/netui-config.xsd
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/util/schema/netui-config.xsd?view=auto&rev=149128
==============================================================================
Copied:
incubator/beehive/trunk/netui/src/util/schema/netui-config/config.xsdconfig
(from r149122, incubator/beehive/trunk/netui/src/util/schema/config.xsdconfig)
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/util/schema/netui-config/config.xsdconfig?view=diff&rev=149129&p1=incubator/beehive/trunk/netui/src/util/schema/config.xsdconfig&r1=149122&p2=incubator/beehive/trunk/netui/src/util/schema/netui-config/config.xsdconfig&r2=149129
==============================================================================
Copied:
incubator/beehive/trunk/netui/src/util/schema/netui-config/netui-config.xsd
(from r149122, incubator/beehive/trunk/netui/src/util/schema/netui-config.xsd)
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/util/schema/netui-config/netui-config.xsd?view=diff&rev=149129&p1=incubator/beehive/trunk/netui/src/util/schema/netui-config.xsd&r1=149122&p2=incubator/beehive/trunk/netui/src/util/schema/netui-config/netui-config.xsd&r2=149129
==============================================================================
