You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by mb...@apache.org on 2007/02/20 17:12:22 UTC
svn commit: r509625 - in
/myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver:
CustomResolverBase.java ResolverForFaces.java ResolverForJSP.java
Author: mbr
Date: Tue Feb 20 08:12:20 2007
New Revision: 509625
URL: http://svn.apache.org/viewvc?view=rev&rev=509625
Log:
ResolverForJSP must not uses resolvers for faces
The default constructor of ResolverForFaces was implicit invoked by ResolverForJSP
Added:
myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/CustomResolverBase.java (with props)
Modified:
myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/ResolverForFaces.java
myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/ResolverForJSP.java
Added: myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/CustomResolverBase.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/CustomResolverBase.java?view=auto&rev=509625
==============================================================================
--- myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/CustomResolverBase.java (added)
+++ myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/CustomResolverBase.java Tue Feb 20 08:12:20 2007
@@ -0,0 +1,77 @@
+/*
+ * Copyright 2007 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.myfaces.el.unified.resolver;
+
+import javax.el.CompositeELResolver;
+import javax.el.ELResolver;
+
+import org.apache.myfaces.el.convert.PropertyResolverToELResolver;
+import org.apache.myfaces.el.convert.VariableResolverToELResolver;
+
+/**
+ * Handles custom el resolvers
+ *
+ * @author Mathias Broekelmann (latest modification by $Author$)
+ * @version $Revision$ $Date$
+ */
+public class CustomResolverBase extends CompositeELResolver
+{
+ protected CompositeELResolver resolversFromAppConfig = new CompositeELResolver();
+
+ protected CompositeELResolver resolversFromLegacyVariableResolvers = new CompositeELResolver();
+
+ protected CompositeELResolver resolversFromLegacyPropertyResolvers = new CompositeELResolver();
+
+ protected CompositeELResolver resolversFromApplicationAddResolver = new CompositeELResolver();
+
+ protected void addCustomResolvers()
+ {
+ add(resolversFromAppConfig);
+ add(resolversFromLegacyVariableResolvers);
+ add(resolversFromLegacyPropertyResolvers);
+ add(resolversFromApplicationAddResolver);
+ }
+
+ // The following methods allow resolvers to be added to the proper position in the
+ // chain at any time
+ public void addResolverFromAppConfig(ELResolver resolver)
+ {
+ resolversFromAppConfig.add(resolver);
+ }
+
+ // We allow more than one call, but it is expected that this will be
+ // called only once by passing in the fully-constructed VariableResolver chain
+ @SuppressWarnings("deprecation")
+ public void addResolverFromLegacyVariableResolver(
+ javax.faces.el.VariableResolver resolver)
+ {
+ resolversFromLegacyVariableResolvers
+ .add(new VariableResolverToELResolver(resolver));
+ }
+
+ @SuppressWarnings("deprecation")
+ public void addResolverFromLegacyPropertyResolver(
+ javax.faces.el.PropertyResolver resolver)
+ {
+ resolversFromLegacyPropertyResolvers
+ .add(new PropertyResolverToELResolver(resolver));
+ }
+
+ public void addResolverFromApplicationAddResolver(ELResolver resolver)
+ {
+ this.resolversFromApplicationAddResolver.add(resolver);
+ }
+}
Propchange: myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/CustomResolverBase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/CustomResolverBase.java
------------------------------------------------------------------------------
svn:keywords = URL Author Revision Date
Modified: myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/ResolverForFaces.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/ResolverForFaces.java?view=diff&rev=509625&r1=509624&r2=509625
==============================================================================
--- myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/ResolverForFaces.java (original)
+++ myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/ResolverForFaces.java Tue Feb 20 08:12:20 2007
@@ -18,19 +18,11 @@
import javax.el.ArrayELResolver;
import javax.el.BeanELResolver;
-import javax.el.CompositeELResolver;
-import javax.el.ELResolver;
import javax.el.ListELResolver;
import javax.el.MapELResolver;
import javax.el.ResourceBundleELResolver;
-import javax.faces.el.PropertyResolver;
-import javax.faces.el.VariableResolver;
-import org.apache.myfaces.el.convert.PropertyResolverToELResolver;
-import org.apache.myfaces.el.convert.VariableResolverToELResolver;
+
import org.apache.myfaces.el.unified.resolver.implicitobject.ImplicitObjectResolver;
-import org.apache.myfaces.el.unified.resolver.ManagedBeanResolver;
-import org.apache.myfaces.el.unified.resolver.ResourceBundleResolver;
-import org.apache.myfaces.el.unified.resolver.ScopedAttributeResolver;
/**
* Provides an ELResolver for Faces.
@@ -39,31 +31,12 @@
*
* @author Stan Silvert
*/
-public class ResolverForFaces extends CompositeELResolver {
-
- protected CompositeELResolver resolversFromAppConfig
- = new CompositeELResolver();
-
- protected CompositeELResolver resolversFromLegacyVariableResolvers
- = new CompositeELResolver();
-
- protected CompositeELResolver resolversFromLegacyPropertyResolvers
- = new CompositeELResolver();
-
- protected CompositeELResolver resolversFromApplicationAddResolver
- = new CompositeELResolver();
+public class ResolverForFaces extends CustomResolverBase {
/** Creates a new instance of ResolverForFaces */
public ResolverForFaces() {
add(ImplicitObjectResolver.makeResolverForFaces());
-
- CompositeELResolver compResolver = new CompositeELResolver();
- compResolver.add(resolversFromAppConfig);
- compResolver.add(resolversFromLegacyVariableResolvers);
- compResolver.add(resolversFromLegacyPropertyResolvers);
- compResolver.add(resolversFromApplicationAddResolver);
-
- add(compResolver);
+ addCustomResolvers();
add(new ManagedBeanResolver());
add(new ResourceBundleELResolver());
add(new ResourceBundleResolver());
@@ -71,29 +44,6 @@
add(new ListELResolver());
add(new ArrayELResolver());
add(new BeanELResolver());
- add(new ScopedAttributeResolver());
-
- }
-
- // The following methods allow resolvers to be added to the proper position in the
- // chain at any time
- public void addResolverFromAppConfig(ELResolver resolver) {
- //TODO: implement
- throw new RuntimeException("Not implemented yet");
+ add(new ScopedAttributeResolver());
}
-
- // We allow more than one call, but it is expected that this will be
- // called only once by passing in the fully-constructed VariableResolver chain
- public void addResolverFromLegacyVariableResolver(VariableResolver resolver) {
- resolversFromLegacyPropertyResolvers.add(new VariableResolverToELResolver(resolver));
- }
-
- public void addResolverFromLegacyPropertyResolver(PropertyResolver resolver) {
- resolversFromLegacyPropertyResolvers.add(new PropertyResolverToELResolver(resolver));
- }
-
- public void addResolverFromApplicationAddResolver(ELResolver resolver) {
- this.resolversFromApplicationAddResolver.add(resolver);
- }
-
}
Modified: myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/ResolverForJSP.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/ResolverForJSP.java?view=diff&rev=509625&r1=509624&r2=509625
==============================================================================
--- myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/ResolverForJSP.java (original)
+++ myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/ResolverForJSP.java Tue Feb 20 08:12:20 2007
@@ -17,8 +17,6 @@
package org.apache.myfaces.el.unified.resolver;
import org.apache.myfaces.el.unified.resolver.implicitobject.ImplicitObjectResolver;
-import org.apache.myfaces.el.unified.resolver.ManagedBeanResolver;
-import org.apache.myfaces.el.unified.resolver.ResourceBundleResolver;
/**
* Provides an ELResolver for Faces.
@@ -27,17 +25,14 @@
*
* @author Stan Silvert
*/
-public class ResolverForJSP extends ResolverForFaces {
+public class ResolverForJSP extends CustomResolverBase {
/** Creates a new instance of ResolverForJSP */
public ResolverForJSP() {
add(ImplicitObjectResolver.makeResolverForJSP());
add(new ManagedBeanResolver());
add(new ResourceBundleResolver());
- add(resolversFromAppConfig);
- add(resolversFromLegacyVariableResolvers);
- add(resolversFromLegacyPropertyResolvers);
- add(resolversFromApplicationAddResolver);
+ addCustomResolvers();
}
}