You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by sl...@apache.org on 2008/08/29 01:48:01 UTC
svn commit: r690051 [2/3] - in /myfaces/core/branches/2_0_0:
api/src/main/java/javax/faces/component/ api/src/main/java/javax/faces/el/
api/src/main/java/javax/faces/lifecycle/
api/src/main/java/javax/faces/webapp/ api/src/test/java/javax/faces/
api/sr...
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/application/jsp/JspStateManagerImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/application/jsp/JspStateManagerImpl.java?rev=690051&r1=690050&r2=690051&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/application/jsp/JspStateManagerImpl.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/application/jsp/JspStateManagerImpl.java Thu Aug 28 16:47:56 2008
@@ -18,25 +18,15 @@
*/
package org.apache.myfaces.application.jsp;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.io.OutputStream;
-import java.io.Serializable;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.zip.GZIPInputStream;
-import java.util.zip.GZIPOutputStream;
+import org.apache.commons.collections.map.AbstractReferenceMap;
+import org.apache.commons.collections.map.ReferenceMap;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.myfaces.application.MyfacesStateManager;
+import org.apache.myfaces.application.TreeStructureManager;
+import org.apache.myfaces.renderkit.MyfacesResponseStateManager;
+import org.apache.myfaces.shared_impl.renderkit.RendererUtils;
+import org.apache.myfaces.shared_impl.util.MyFacesObjectInputStream;
import javax.faces.FactoryFinder;
import javax.faces.component.NamingContainer;
@@ -47,16 +37,11 @@
import javax.faces.render.RenderKit;
import javax.faces.render.RenderKitFactory;
import javax.faces.render.ResponseStateManager;
-
-import org.apache.commons.collections.map.AbstractReferenceMap;
-import org.apache.commons.collections.map.ReferenceMap;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.application.MyfacesStateManager;
-import org.apache.myfaces.application.TreeStructureManager;
-import org.apache.myfaces.renderkit.MyfacesResponseStateManager;
-import org.apache.myfaces.shared_impl.renderkit.RendererUtils;
-import org.apache.myfaces.shared_impl.util.MyFacesObjectInputStream;
+import java.io.*;
+import java.lang.reflect.Method;
+import java.util.*;
+import java.util.zip.GZIPInputStream;
+import java.util.zip.GZIPOutputStream;
/**
* Default StateManager implementation for use when views are defined
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/application/jsp/JspViewHandlerImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/application/jsp/JspViewHandlerImpl.java?rev=690051&r1=690050&r2=690051&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/application/jsp/JspViewHandlerImpl.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/application/jsp/JspViewHandlerImpl.java Thu Aug 28 16:47:56 2008
@@ -18,11 +18,13 @@
*/
package org.apache.myfaces.application.jsp;
-import java.io.IOException;
-import java.io.StringWriter;
-import java.io.Writer;
-import java.util.Iterator;
-import java.util.Locale;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.myfaces.application.DefaultViewHandlerSupport;
+import org.apache.myfaces.application.InvalidViewIdException;
+import org.apache.myfaces.application.ViewHandlerSupport;
+import org.apache.myfaces.shared_impl.config.MyfacesConfig;
+import org.apache.myfaces.shared_impl.renderkit.html.util.JavascriptUtils;
import javax.faces.FacesException;
import javax.faces.FactoryFinder;
@@ -42,14 +44,11 @@
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import javax.servlet.jsp.jstl.core.Config;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.application.DefaultViewHandlerSupport;
-import org.apache.myfaces.application.InvalidViewIdException;
-import org.apache.myfaces.application.ViewHandlerSupport;
-import org.apache.myfaces.shared_impl.config.MyfacesConfig;
-import org.apache.myfaces.shared_impl.renderkit.html.util.JavascriptUtils;
+import java.io.IOException;
+import java.io.StringWriter;
+import java.io.Writer;
+import java.util.Iterator;
+import java.util.Locale;
/**
* Implementation of the ViewHandler interface that knows how to use JSP pages
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/application/jsp/ViewResponseWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/application/jsp/ViewResponseWrapper.java?rev=690051&r1=690050&r2=690051&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/application/jsp/ViewResponseWrapper.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/application/jsp/ViewResponseWrapper.java Thu Aug 28 16:47:56 2008
@@ -18,20 +18,15 @@
*/
package org.apache.myfaces.application.jsp;
-import java.io.ByteArrayOutputStream;
-import java.io.CharArrayWriter;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.Writer;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletResponseWrapper;
+import java.io.*;
import java.nio.ByteBuffer;
import java.nio.CharBuffer;
import java.nio.charset.Charset;
import java.nio.charset.CharsetDecoder;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletResponseWrapper;
-
/**
* @author Bruno Aranda (latest modification by $Author$)
* @version $Revision$ $Date$
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/FacesConfigDispenser.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/FacesConfigDispenser.java?rev=690051&r1=690050&r2=690051&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/FacesConfigDispenser.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/FacesConfigDispenser.java Thu Aug 28 16:47:56 2008
@@ -18,16 +18,16 @@
*/
package org.apache.myfaces.config;
-import java.util.Iterator;
-
-import javax.el.ELResolver;
-
import org.apache.myfaces.config.element.ManagedBean;
import org.apache.myfaces.config.element.NavigationRule;
import org.apache.myfaces.config.element.Renderer;
import org.apache.myfaces.config.impl.digester.elements.Converter;
import org.apache.myfaces.config.impl.digester.elements.ResourceBundle;
+import javax.el.ELResolver;
+
+import java.util.Iterator;
+
/**
* Subsumes several unmarshalled faces config objects and presents a simple interface
* to the combined configuration data.
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/FacesConfigUnmarshaller.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/FacesConfigUnmarshaller.java?rev=690051&r1=690050&r2=690051&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/FacesConfigUnmarshaller.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/FacesConfigUnmarshaller.java Thu Aug 28 16:47:56 2008
@@ -18,8 +18,8 @@
*/
package org.apache.myfaces.config;
-import java.io.IOException;
import java.io.InputStream;
+import java.io.IOException;
import org.xml.sax.SAXException;
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java?rev=690051&r1=690050&r2=690051&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java Thu Aug 28 16:47:56 2008
@@ -18,45 +18,6 @@
*/
package org.apache.myfaces.config;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.net.URL;
-import java.net.URLConnection;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Set;
-import java.util.StringTokenizer;
-import java.util.TreeMap;
-
-import javax.el.ELResolver;
-import javax.faces.FacesException;
-import javax.faces.FactoryFinder;
-import javax.faces.application.Application;
-import javax.faces.application.ApplicationFactory;
-import javax.faces.application.NavigationHandler;
-import javax.faces.application.StateManager;
-import javax.faces.application.ViewHandler;
-import javax.faces.context.ExternalContext;
-import javax.faces.el.PropertyResolver;
-import javax.faces.el.VariableResolver;
-import javax.faces.event.ActionListener;
-import javax.faces.event.PhaseListener;
-import javax.faces.lifecycle.Lifecycle;
-import javax.faces.lifecycle.LifecycleFactory;
-import javax.faces.render.RenderKit;
-import javax.faces.render.RenderKitFactory;
-import javax.faces.webapp.FacesServlet;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.myfaces.application.ApplicationFactoryImpl;
@@ -81,6 +42,28 @@
import org.apache.myfaces.shared_impl.util.serial.SerialFactory;
import org.xml.sax.SAXException;
+import javax.el.ELResolver;
+import javax.faces.FacesException;
+import javax.faces.FactoryFinder;
+import javax.faces.application.*;
+import javax.faces.context.ExternalContext;
+import javax.faces.el.PropertyResolver;
+import javax.faces.el.VariableResolver;
+import javax.faces.event.ActionListener;
+import javax.faces.event.PhaseListener;
+import javax.faces.lifecycle.Lifecycle;
+import javax.faces.lifecycle.LifecycleFactory;
+import javax.faces.render.RenderKit;
+import javax.faces.render.RenderKitFactory;
+import javax.faces.webapp.FacesServlet;
+import java.io.*;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.net.URL;
+import java.net.URLConnection;
+import java.util.*;
+
/**
* Configures everything for a given context. The FacesConfigurator is independent of the concrete implementations that
* lie behind FacesConfigUnmarshaller and FacesConfigDispenser.
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/LastVariableResolverInChain.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/LastVariableResolverInChain.java?rev=690051&r1=690050&r2=690051&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/LastVariableResolverInChain.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/LastVariableResolverInChain.java Thu Aug 28 16:47:56 2008
@@ -18,9 +18,9 @@
*/
package org.apache.myfaces.config;
-import javax.faces.context.FacesContext;
-import javax.faces.el.EvaluationException;
import javax.faces.el.VariableResolver;
+import javax.faces.el.EvaluationException;
+import javax.faces.context.FacesContext;
/**
* Represents the last Variable resolver in the chain - is added to be able to
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/ManagedBeanBuilder.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/ManagedBeanBuilder.java?rev=690051&r1=690050&r2=690051&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/ManagedBeanBuilder.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/ManagedBeanBuilder.java Thu Aug 28 16:47:56 2008
@@ -40,8 +40,8 @@
import org.apache.commons.beanutils.PropertyUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.config.annotation.LifecycleProvider;
import org.apache.myfaces.config.annotation.LifecycleProviderFactory;
+import org.apache.myfaces.config.annotation.LifecycleProvider;
import org.apache.myfaces.config.element.ListEntries;
import org.apache.myfaces.config.element.ListEntry;
import org.apache.myfaces.config.element.ManagedBean;
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/annotation/AllAnnotationLifecycleProvider.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/annotation/AllAnnotationLifecycleProvider.java?rev=690051&r1=690050&r2=690051&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/annotation/AllAnnotationLifecycleProvider.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/annotation/AllAnnotationLifecycleProvider.java Thu Aug 28 16:47:56 2008
@@ -18,17 +18,18 @@
*/
package org.apache.myfaces.config.annotation;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
+import javax.naming.NamingException;
+import javax.naming.Context;
import javax.annotation.Resource;
import javax.ejb.EJB;
-import javax.naming.Context;
-import javax.naming.NamingException;
import javax.persistence.PersistenceContext;
import javax.persistence.PersistenceUnit;
+
+import java.lang.reflect.Method;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Field;
+
// TODO @EJBs
public class AllAnnotationLifecycleProvider extends ResourceAnnotationLifecycleProvider
{
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/annotation/DefaultLifecycleProviderFactory.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/annotation/DefaultLifecycleProviderFactory.java?rev=690051&r1=690050&r2=690051&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/annotation/DefaultLifecycleProviderFactory.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/annotation/DefaultLifecycleProviderFactory.java Thu Aug 28 16:47:56 2008
@@ -18,20 +18,19 @@
*/
package org.apache.myfaces.config.annotation;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.commons.discovery.resource.ClassLoaders;
+import org.apache.commons.discovery.resource.names.DiscoverServiceNames;
+import org.apache.commons.discovery.ResourceNameIterator;
+import org.apache.myfaces.shared_impl.util.ClassUtils;
import javax.faces.context.ExternalContext;
import javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.NamingException;
-
-import org.apache.commons.discovery.ResourceNameIterator;
-import org.apache.commons.discovery.resource.ClassLoaders;
-import org.apache.commons.discovery.resource.names.DiscoverServiceNames;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Constructor;
/*
* Date: Mar 12, 2007
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/annotation/LifecycleProviderFactory.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/annotation/LifecycleProviderFactory.java?rev=690051&r1=690050&r2=690051&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/annotation/LifecycleProviderFactory.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/annotation/LifecycleProviderFactory.java Thu Aug 28 16:47:56 2008
@@ -18,11 +18,12 @@
*/
package org.apache.myfaces.config.annotation;
-import javax.faces.context.ExternalContext;
-
import org.apache.commons.discovery.tools.DiscoverSingleton;
+import javax.faces.context.ExternalContext;
+
+
public abstract class LifecycleProviderFactory {
protected static final String FACTORY_DEFAULT = DefaultLifecycleProviderFactory.class.getName();
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/annotation/NoAnnotationLifecyleProvider.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/annotation/NoAnnotationLifecyleProvider.java?rev=690051&r1=690050&r2=690051&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/annotation/NoAnnotationLifecyleProvider.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/annotation/NoAnnotationLifecyleProvider.java Thu Aug 28 16:47:56 2008
@@ -18,10 +18,10 @@
*/
package org.apache.myfaces.config.annotation;
-import java.lang.reflect.InvocationTargetException;
-
import org.apache.myfaces.shared_impl.util.ClassUtils;
+import java.lang.reflect.InvocationTargetException;
+
public class NoAnnotationLifecyleProvider implements LifecycleProvider
{
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/annotation/NoInjectionAnnotationLifecycleProvider.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/annotation/NoInjectionAnnotationLifecycleProvider.java?rev=690051&r1=690050&r2=690051&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/annotation/NoInjectionAnnotationLifecycleProvider.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/annotation/NoInjectionAnnotationLifecycleProvider.java Thu Aug 28 16:47:56 2008
@@ -18,15 +18,14 @@
*/
package org.apache.myfaces.config.annotation;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
+import org.apache.myfaces.shared_impl.util.ClassUtils;
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
import javax.naming.NamingException;
-
-import org.apache.myfaces.shared_impl.util.ClassUtils;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
/**
* See SRV.14.5 Servlet Specification Version 2.5 JSR 154
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/annotation/ResourceAnnotationLifecycleProvider.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/annotation/ResourceAnnotationLifecycleProvider.java?rev=690051&r1=690050&r2=690051&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/annotation/ResourceAnnotationLifecycleProvider.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/annotation/ResourceAnnotationLifecycleProvider.java Thu Aug 28 16:47:56 2008
@@ -18,13 +18,12 @@
*/
package org.apache.myfaces.config.annotation;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-import javax.annotation.Resource;
-import javax.naming.Context;
import javax.naming.NamingException;
+import javax.naming.Context;
+import javax.annotation.Resource;
+import java.lang.reflect.Method;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Field;
// TODO @Resources
public class ResourceAnnotationLifecycleProvider extends NoInjectionAnnotationLifecycleProvider
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/annotation/TomcatAnnotationLifecycleProvider.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/annotation/TomcatAnnotationLifecycleProvider.java?rev=690051&r1=690050&r2=690051&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/annotation/TomcatAnnotationLifecycleProvider.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/annotation/TomcatAnnotationLifecycleProvider.java Thu Aug 28 16:47:56 2008
@@ -18,15 +18,14 @@
*/
package org.apache.myfaces.config.annotation;
-import java.lang.reflect.InvocationTargetException;
+import org.apache.myfaces.shared_impl.util.ClassUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
-import javax.faces.context.ExternalContext;
import javax.naming.NamingException;
+import javax.faces.context.ExternalContext;
import javax.servlet.ServletContext;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
+import java.lang.reflect.InvocationTargetException;
public class TomcatAnnotationLifecycleProvider implements DiscoverableLifecycleProvider
{
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/element/ManagedBean.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/element/ManagedBean.java?rev=690051&r1=690050&r2=690051&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/element/ManagedBean.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/element/ManagedBean.java Thu Aug 28 16:47:56 2008
@@ -20,6 +20,8 @@
import java.util.Iterator;
+import org.apache.myfaces.config.element.ListEntries;
+
/**
* @author Manfred Geiler (latest modification by $Author$)
* @version $Revision$ $Date$
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/element/ManagedProperty.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/element/ManagedProperty.java?rev=690051&r1=690050&r2=690051&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/element/ManagedProperty.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/element/ManagedProperty.java Thu Aug 28 16:47:56 2008
@@ -21,6 +21,8 @@
import javax.faces.context.FacesContext;
import javax.faces.el.ValueBinding;
+import org.apache.myfaces.config.element.ListEntries;
+
/**
* @author Manfred Geiler (latest modification by $Author$)
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/impl/FacesConfigEntityResolver.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/impl/FacesConfigEntityResolver.java?rev=690051&r1=690050&r2=690051&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/impl/FacesConfigEntityResolver.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/impl/FacesConfigEntityResolver.java Thu Aug 28 16:47:56 2008
@@ -18,20 +18,20 @@
*/
package org.apache.myfaces.config.impl;
+import org.apache.myfaces.shared_impl.util.ClassUtils;
+import org.xml.sax.EntityResolver;
+import org.xml.sax.InputSource;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import javax.faces.context.ExternalContext;
import java.io.IOException;
import java.io.InputStream;
import java.net.JarURLConnection;
import java.net.URL;
import java.util.jar.JarEntry;
-import javax.faces.context.ExternalContext;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
-import org.xml.sax.EntityResolver;
-import org.xml.sax.InputSource;
-
/**
* DOCUMENT ME!
* @author Manfred Geiler (latest modification by $Author$)
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/impl/digester/DigesterFacesConfigDispenserImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/impl/digester/DigesterFacesConfigDispenserImpl.java?rev=690051&r1=690050&r2=690051&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/impl/digester/DigesterFacesConfigDispenserImpl.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/impl/digester/DigesterFacesConfigDispenserImpl.java Thu Aug 28 16:47:56 2008
@@ -18,16 +18,6 @@
*/
package org.apache.myfaces.config.impl.digester;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.faces.render.RenderKitFactory;
-
import org.apache.myfaces.config.FacesConfigDispenser;
import org.apache.myfaces.config.element.ManagedBean;
import org.apache.myfaces.config.element.NavigationRule;
@@ -40,6 +30,16 @@
import org.apache.myfaces.config.impl.digester.elements.RenderKit;
import org.apache.myfaces.config.impl.digester.elements.ResourceBundle;
+import javax.faces.render.RenderKitFactory;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
/**
* @author <a href="mailto:oliver@rossmueller.com">Oliver Rossmueller</a>
*/
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/impl/digester/DigesterFacesConfigUnmarshallerImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/impl/digester/DigesterFacesConfigUnmarshallerImpl.java?rev=690051&r1=690050&r2=690051&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/impl/digester/DigesterFacesConfigUnmarshallerImpl.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/impl/digester/DigesterFacesConfigUnmarshallerImpl.java Thu Aug 28 16:47:56 2008
@@ -21,28 +21,12 @@
import java.io.IOException;
import java.io.InputStream;
import java.util.List;
-
import javax.faces.context.ExternalContext;
-import org.apache.commons.digester.Digester;
import org.apache.myfaces.config.FacesConfigUnmarshaller;
+import org.apache.myfaces.config.impl.digester.elements.*;
import org.apache.myfaces.config.impl.FacesConfigEntityResolver;
-import org.apache.myfaces.config.impl.digester.elements.Application;
-import org.apache.myfaces.config.impl.digester.elements.Attribute;
-import org.apache.myfaces.config.impl.digester.elements.Converter;
-import org.apache.myfaces.config.impl.digester.elements.FacesConfig;
-import org.apache.myfaces.config.impl.digester.elements.Factory;
-import org.apache.myfaces.config.impl.digester.elements.ListEntries;
-import org.apache.myfaces.config.impl.digester.elements.LocaleConfig;
-import org.apache.myfaces.config.impl.digester.elements.ManagedBean;
-import org.apache.myfaces.config.impl.digester.elements.ManagedProperty;
-import org.apache.myfaces.config.impl.digester.elements.MapEntries;
-import org.apache.myfaces.config.impl.digester.elements.NavigationCase;
-import org.apache.myfaces.config.impl.digester.elements.NavigationRule;
-import org.apache.myfaces.config.impl.digester.elements.Property;
-import org.apache.myfaces.config.impl.digester.elements.RenderKit;
-import org.apache.myfaces.config.impl.digester.elements.Renderer;
-import org.apache.myfaces.config.impl.digester.elements.ResourceBundle;
+import org.apache.commons.digester.Digester;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/Attribute.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/Attribute.java?rev=690051&r1=690050&r2=690051&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/Attribute.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/Attribute.java Thu Aug 28 16:47:56 2008
@@ -18,10 +18,10 @@
*/
package org.apache.myfaces.config.impl.digester.elements;
+import java.util.List;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.Iterator;
-import java.util.List;
+import java.util.Collections;
/**
* @author Martin Marinschek
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/Converter.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/Converter.java?rev=690051&r1=690050&r2=690051&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/Converter.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/Converter.java Thu Aug 28 16:47:56 2008
@@ -19,9 +19,9 @@
package org.apache.myfaces.config.impl.digester.elements;
import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
import java.util.List;
+import java.util.Iterator;
+import java.util.Collections;
/**
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ListEntries.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ListEntries.java?rev=690051&r1=690050&r2=690051&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ListEntries.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ListEntries.java Thu Aug 28 16:47:56 2008
@@ -19,8 +19,8 @@
package org.apache.myfaces.config.impl.digester.elements;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
+import java.util.Iterator;
/**
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ManagedBean.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ManagedBean.java?rev=690051&r1=690050&r2=690051&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ManagedBean.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ManagedBean.java Thu Aug 28 16:47:56 2008
@@ -18,12 +18,12 @@
*/
package org.apache.myfaces.config.impl.digester.elements;
+import org.apache.myfaces.shared_impl.util.ClassUtils;
+
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
-
/**
* @author <a href="mailto:oliver@rossmueller.com">Oliver Rossmueller</a>
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ManagedProperty.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ManagedProperty.java?rev=690051&r1=690050&r2=690051&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ManagedProperty.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ManagedProperty.java Thu Aug 28 16:47:56 2008
@@ -21,6 +21,7 @@
import javax.faces.context.FacesContext;
import javax.faces.el.ValueBinding;
+import org.apache.myfaces.config.impl.digester.elements.ListEntries;
import org.apache.myfaces.util.ContainerUtils;
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/MapEntries.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/MapEntries.java?rev=690051&r1=690050&r2=690051&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/MapEntries.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/MapEntries.java Thu Aug 28 16:47:56 2008
@@ -19,8 +19,8 @@
package org.apache.myfaces.config.impl.digester.elements;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
+import java.util.Iterator;
/**
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/NavigationRule.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/NavigationRule.java?rev=690051&r1=690050&r2=690051&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/NavigationRule.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/NavigationRule.java Thu Aug 28 16:47:56 2008
@@ -19,8 +19,10 @@
package org.apache.myfaces.config.impl.digester.elements;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.List;
+import java.util.Collection;
+
+import org.apache.myfaces.config.impl.digester.elements.NavigationCase;
/**
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/Property.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/Property.java?rev=690051&r1=690050&r2=690051&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/Property.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/Property.java Thu Aug 28 16:47:56 2008
@@ -18,10 +18,10 @@
*/
package org.apache.myfaces.config.impl.digester.elements;
+import java.util.List;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.Iterator;
-import java.util.List;
+import java.util.Collections;
/**
* @author Martin Marinschek
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/FacesContextFactoryImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/FacesContextFactoryImpl.java?rev=690051&r1=690050&r2=690051&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/FacesContextFactoryImpl.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/FacesContextFactoryImpl.java Thu Aug 28 16:47:56 2008
@@ -18,6 +18,8 @@
*/
package org.apache.myfaces.context;
+import org.apache.myfaces.context.servlet.FacesContextImpl;
+
import javax.faces.FacesException;
import javax.faces.context.FacesContext;
import javax.faces.context.FacesContextFactory;
@@ -29,8 +31,6 @@
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
-import org.apache.myfaces.context.servlet.FacesContextImpl;
-
/**
* DOCUMENT ME!
* @author Manfred Geiler (latest modification by $Author$)
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/FacesContextWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/FacesContextWrapper.java?rev=690051&r1=690050&r2=690051&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/FacesContextWrapper.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/FacesContextWrapper.java Thu Aug 28 16:47:56 2008
@@ -18,8 +18,6 @@
*/
package org.apache.myfaces.context;
-import java.util.Iterator;
-
import javax.el.ELContext;
import javax.faces.application.Application;
import javax.faces.application.FacesMessage;
@@ -30,6 +28,7 @@
import javax.faces.context.ResponseStream;
import javax.faces.context.ResponseWriter;
import javax.faces.render.RenderKit;
+import java.util.Iterator;
/**
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/portlet/ApplicationMap.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/portlet/ApplicationMap.java?rev=690051&r1=690050&r2=690051&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/portlet/ApplicationMap.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/portlet/ApplicationMap.java Thu Aug 28 16:47:56 2008
@@ -20,7 +20,6 @@
import java.util.Enumeration;
import java.util.Map;
-
import javax.portlet.PortletContext;
import org.apache.myfaces.util.AbstractAttributeMap;
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/portlet/PortletExternalContextImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/portlet/PortletExternalContextImpl.java?rev=690051&r1=690050&r2=690051&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/portlet/PortletExternalContextImpl.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/portlet/PortletExternalContextImpl.java Thu Aug 28 16:47:56 2008
@@ -405,7 +405,7 @@
* @param request
*/
@Override
- public void setRequest(Object request)
+ public void setRequest(java.lang.Object request)
{
this._portletRequest = (PortletRequest) request;
this._actionRequest = isActionRequest(_portletRequest) ? (ActionRequest) request : null;
@@ -416,7 +416,7 @@
* @param encoding
* @throws java.io.UnsupportedEncodingException
*/
- public void setRequestCharacterEncoding(String encoding)
+ public void setRequestCharacterEncoding(java.lang.String encoding)
throws java.io.UnsupportedEncodingException{
if(_actionRequest != null)
@@ -445,7 +445,7 @@
* @param response
*/
@Override
- public void setResponse(Object response)
+ public void setResponse(java.lang.Object response)
{
this._portletResponse = (PortletResponse) response;
}
@@ -455,7 +455,7 @@
* @param encoding
*/
@Override
- public void setResponseCharacterEncoding(String encoding)
+ public void setResponseCharacterEncoding(java.lang.String encoding)
{
// nope!
}
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/portlet/RequestHeaderMap.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/portlet/RequestHeaderMap.java?rev=690051&r1=690050&r2=690051&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/portlet/RequestHeaderMap.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/portlet/RequestHeaderMap.java Thu Aug 28 16:47:56 2008
@@ -20,7 +20,6 @@
import java.util.Enumeration;
import java.util.Map;
-
import javax.portlet.PortletRequest;
import org.apache.myfaces.util.AbstractAttributeMap;
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/portlet/RequestMap.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/portlet/RequestMap.java?rev=690051&r1=690050&r2=690051&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/portlet/RequestMap.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/portlet/RequestMap.java Thu Aug 28 16:47:56 2008
@@ -20,7 +20,6 @@
import java.util.Enumeration;
import java.util.Map;
-
import javax.portlet.PortletRequest;
import org.apache.myfaces.util.AbstractAttributeMap;
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/portlet/RequestParameterMap.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/portlet/RequestParameterMap.java?rev=690051&r1=690050&r2=690051&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/portlet/RequestParameterMap.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/portlet/RequestParameterMap.java Thu Aug 28 16:47:56 2008
@@ -19,7 +19,6 @@
package org.apache.myfaces.context.portlet;
import java.util.Enumeration;
-
import javax.portlet.PortletRequest;
import org.apache.myfaces.util.AbstractAttributeMap;
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/portlet/RequestParameterValuesMap.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/portlet/RequestParameterValuesMap.java?rev=690051&r1=690050&r2=690051&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/portlet/RequestParameterValuesMap.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/portlet/RequestParameterValuesMap.java Thu Aug 28 16:47:56 2008
@@ -19,7 +19,6 @@
package org.apache.myfaces.context.portlet;
import java.util.Enumeration;
-
import javax.portlet.PortletRequest;
import org.apache.myfaces.util.AbstractAttributeMap;
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/portlet/SessionMap.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/portlet/SessionMap.java?rev=690051&r1=690050&r2=690051&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/portlet/SessionMap.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/portlet/SessionMap.java Thu Aug 28 16:47:56 2008
@@ -18,15 +18,14 @@
*/
package org.apache.myfaces.context.portlet;
+import org.apache.myfaces.shared_impl.util.NullEnumeration;
+import org.apache.myfaces.util.AbstractAttributeMap;
+
import java.util.Enumeration;
import java.util.Map;
-
import javax.portlet.PortletRequest;
import javax.portlet.PortletSession;
-import org.apache.myfaces.shared_impl.util.NullEnumeration;
-import org.apache.myfaces.util.AbstractAttributeMap;
-
/**
* Portlet scope PortletSession attibutes as Map.
*
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/servlet/FacesContextImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/servlet/FacesContextImpl.java?rev=690051&r1=690050&r2=690051&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/servlet/FacesContextImpl.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/servlet/FacesContextImpl.java Thu Aug 28 16:47:56 2008
@@ -18,12 +18,10 @@
*/
package org.apache.myfaces.context.servlet;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Set;
+import org.apache.myfaces.context.ReleaseableExternalContext;
+import org.apache.myfaces.context.portlet.PortletExternalContextImpl;
+import org.apache.myfaces.el.unified.FacesELContext;
+import org.apache.myfaces.shared_impl.util.NullIterator;
import javax.el.ELContext;
import javax.el.ELContextEvent;
@@ -45,11 +43,7 @@
import javax.servlet.ServletContext;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
-
-import org.apache.myfaces.context.ReleaseableExternalContext;
-import org.apache.myfaces.context.portlet.PortletExternalContextImpl;
-import org.apache.myfaces.el.unified.FacesELContext;
-import org.apache.myfaces.shared_impl.util.NullIterator;
+import java.util.*;
/**
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImpl.java?rev=690051&r1=690050&r2=690051&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImpl.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImpl.java Thu Aug 28 16:47:56 2008
@@ -438,7 +438,7 @@
* @param request
*/
@Override
- public void setRequest(Object request)
+ public void setRequest(java.lang.Object request)
{
this._servletRequest = (ServletRequest) request;
this._httpServletRequest = isHttpServletRequest(_servletRequest) ? (HttpServletRequest) _servletRequest : null;
@@ -451,7 +451,7 @@
* @throws java.io.UnsupportedEncodingException
*/
@Override
- public void setRequestCharacterEncoding(String encoding) throws java.io.UnsupportedEncodingException
+ public void setRequestCharacterEncoding(java.lang.String encoding) throws java.io.UnsupportedEncodingException
{
this._servletRequest.setCharacterEncoding(encoding);
@@ -481,7 +481,7 @@
* @param response
*/
@Override
- public void setResponse(Object response)
+ public void setResponse(java.lang.Object response)
{
this._servletResponse = (ServletResponse) response;
}
@@ -491,7 +491,7 @@
* @param encoding
*/
@Override
- public void setResponseCharacterEncoding(String encoding)
+ public void setResponseCharacterEncoding(java.lang.String encoding)
{
this._servletResponse.setCharacterEncoding(encoding);
}
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/VariableResolverImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/VariableResolverImpl.java?rev=690051&r1=690050&r2=690051&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/VariableResolverImpl.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/VariableResolverImpl.java Thu Aug 28 16:47:56 2008
@@ -18,6 +18,8 @@
*/
package org.apache.myfaces.el;
+import org.apache.myfaces.el.unified.resolver.FacesCompositeELResolver.Scope;
+
import javax.el.ELContext;
import javax.el.ELException;
import javax.el.ValueExpression;
@@ -26,8 +28,6 @@
import javax.faces.el.EvaluationException;
import javax.faces.el.VariableResolver;
-import org.apache.myfaces.el.unified.resolver.FacesCompositeELResolver.Scope;
-
/**
* This variable resolver will be used for legacy variable resolvers which are registered through the faces config. If
* it is invoked through the faces chain it will use the el resolver of {@link Application#getELResolver()}. If it is
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/convert/PropertyResolverToELResolver.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/convert/PropertyResolverToELResolver.java?rev=690051&r1=690050&r2=690051&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/convert/PropertyResolverToELResolver.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/convert/PropertyResolverToELResolver.java Thu Aug 28 16:47:56 2008
@@ -18,10 +18,6 @@
*/
package org.apache.myfaces.el.convert;
-import java.beans.FeatureDescriptor;
-import java.util.Iterator;
-import java.util.List;
-
import javax.el.ELContext;
import javax.el.ELException;
import javax.el.ELResolver;
@@ -34,6 +30,10 @@
import javax.faces.el.EvaluationException;
import javax.faces.el.PropertyResolver;
+import java.beans.FeatureDescriptor;
+import java.util.Iterator;
+import java.util.List;
+
/**
* Wrapper that converts a VariableResolver into an ELResolver. See JSF 1.2 spec section 5.6.1.6
*
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/convert/VariableResolverToELResolver.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/convert/VariableResolverToELResolver.java?rev=690051&r1=690050&r2=690051&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/convert/VariableResolverToELResolver.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/convert/VariableResolverToELResolver.java Thu Aug 28 16:47:56 2008
@@ -18,11 +18,6 @@
*/
package org.apache.myfaces.el.convert;
-import java.beans.FeatureDescriptor;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
-
import javax.el.ELContext;
import javax.el.ELException;
import javax.el.ELResolver;
@@ -32,6 +27,11 @@
import javax.faces.el.EvaluationException;
import javax.faces.el.VariableResolver;
+import java.beans.FeatureDescriptor;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+
/**
* Wrapper that converts a VariableResolver into an ELResolver. See JSF 1.2 spec section 5.6.1.5
*
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/ResolverBuilderBase.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/ResolverBuilderBase.java?rev=690051&r1=690050&r2=690051&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/ResolverBuilderBase.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/ResolverBuilderBase.java Thu Aug 28 16:47:56 2008
@@ -18,16 +18,16 @@
*/
package org.apache.myfaces.el.unified;
+import org.apache.myfaces.config.RuntimeConfig;
+import org.apache.myfaces.el.convert.PropertyResolverToELResolver;
+import org.apache.myfaces.el.convert.VariableResolverToELResolver;
+
import javax.el.CompositeELResolver;
import javax.el.ELResolver;
import javax.faces.application.Application;
import javax.faces.el.PropertyResolver;
import javax.faces.el.VariableResolver;
-import org.apache.myfaces.config.RuntimeConfig;
-import org.apache.myfaces.el.convert.PropertyResolverToELResolver;
-import org.apache.myfaces.el.convert.VariableResolverToELResolver;
-
/**
* @author Mathias Broekelmann (latest modification by $Author$)
* @version $Revision$ $Date$
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/ResolverBuilderForFaces.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/ResolverBuilderForFaces.java?rev=690051&r1=690050&r2=690051&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/ResolverBuilderForFaces.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/ResolverBuilderForFaces.java Thu Aug 28 16:47:56 2008
@@ -18,6 +18,12 @@
*/
package org.apache.myfaces.el.unified;
+import org.apache.myfaces.config.RuntimeConfig;
+import org.apache.myfaces.el.unified.resolver.ManagedBeanResolver;
+import org.apache.myfaces.el.unified.resolver.ResourceBundleResolver;
+import org.apache.myfaces.el.unified.resolver.ScopedAttributeResolver;
+import org.apache.myfaces.el.unified.resolver.implicitobject.ImplicitObjectResolver;
+
import javax.el.ArrayELResolver;
import javax.el.BeanELResolver;
import javax.el.CompositeELResolver;
@@ -25,12 +31,6 @@
import javax.el.MapELResolver;
import javax.el.ResourceBundleELResolver;
-import org.apache.myfaces.config.RuntimeConfig;
-import org.apache.myfaces.el.unified.resolver.ManagedBeanResolver;
-import org.apache.myfaces.el.unified.resolver.ResourceBundleResolver;
-import org.apache.myfaces.el.unified.resolver.ScopedAttributeResolver;
-import org.apache.myfaces.el.unified.resolver.implicitobject.ImplicitObjectResolver;
-
/**
* Create the el resolver for faces. see 1.2 spec section 5.6.2
*
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/ResolverBuilderForJSP.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/ResolverBuilderForJSP.java?rev=690051&r1=690050&r2=690051&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/ResolverBuilderForJSP.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/ResolverBuilderForJSP.java Thu Aug 28 16:47:56 2008
@@ -18,13 +18,13 @@
*/
package org.apache.myfaces.el.unified;
-import javax.el.CompositeELResolver;
-
import org.apache.myfaces.config.RuntimeConfig;
import org.apache.myfaces.el.unified.resolver.ManagedBeanResolver;
import org.apache.myfaces.el.unified.resolver.ResourceBundleResolver;
import org.apache.myfaces.el.unified.resolver.implicitobject.ImplicitObjectResolver;
+import javax.el.CompositeELResolver;
+
/**
* build the el resolver for jsp. see 1.2 spec section 5.6.1
*
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/FacesCompositeELResolver.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/FacesCompositeELResolver.java?rev=690051&r1=690050&r2=690051&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/FacesCompositeELResolver.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/FacesCompositeELResolver.java Thu Aug 28 16:47:56 2008
@@ -18,15 +18,14 @@
*/
package org.apache.myfaces.el.unified.resolver;
-import java.beans.FeatureDescriptor;
-import java.util.Iterator;
+import org.apache.myfaces.el.VariableResolverImpl;
import javax.el.ELContext;
import javax.faces.application.Application;
import javax.faces.context.FacesContext;
import javax.servlet.jsp.JspApplicationContext;
-
-import org.apache.myfaces.el.VariableResolverImpl;
+import java.beans.FeatureDescriptor;
+import java.util.Iterator;
/**
* <p>
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/ManagedBeanResolver.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/ManagedBeanResolver.java?rev=690051&r1=690050&r2=690051&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/ManagedBeanResolver.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/ManagedBeanResolver.java Thu Aug 28 16:47:56 2008
@@ -24,7 +24,6 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-
import javax.el.ELContext;
import javax.el.ELException;
import javax.el.ELResolver;
@@ -32,7 +31,6 @@
import javax.el.PropertyNotWritableException;
import javax.faces.context.ExternalContext;
import javax.faces.context.FacesContext;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.myfaces.config.ManagedBeanBuilder;
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/ResourceBundleResolver.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/ResourceBundleResolver.java?rev=690051&r1=690050&r2=690051&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/ResourceBundleResolver.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/ResourceBundleResolver.java Thu Aug 28 16:47:56 2008
@@ -23,7 +23,6 @@
import java.util.Iterator;
import java.util.Map;
import java.util.ResourceBundle;
-
import javax.el.ELContext;
import javax.el.ELException;
import javax.el.ELResolver;
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ApplicationImplicitObject.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ApplicationImplicitObject.java?rev=690051&r1=690050&r2=690051&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ApplicationImplicitObject.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ApplicationImplicitObject.java Thu Aug 28 16:47:56 2008
@@ -19,7 +19,6 @@
package org.apache.myfaces.el.unified.resolver.implicitobject;
import java.beans.FeatureDescriptor;
-
import javax.el.ELContext;
/**
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ApplicationScopeImplicitObject.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ApplicationScopeImplicitObject.java?rev=690051&r1=690050&r2=690051&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ApplicationScopeImplicitObject.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ApplicationScopeImplicitObject.java Thu Aug 28 16:47:56 2008
@@ -18,11 +18,10 @@
*/
package org.apache.myfaces.el.unified.resolver.implicitobject;
+import javax.el.ELContext;
import java.beans.FeatureDescriptor;
import java.util.Map;
-import javax.el.ELContext;
-
/**
* Encapsulates information needed by the ImplicitObjectResolver
*
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/CookieImplicitObject.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/CookieImplicitObject.java?rev=690051&r1=690050&r2=690051&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/CookieImplicitObject.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/CookieImplicitObject.java Thu Aug 28 16:47:56 2008
@@ -20,7 +20,6 @@
import java.beans.FeatureDescriptor;
import java.util.Map;
-
import javax.el.ELContext;
/**
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/FacesContextImplicitObject.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/FacesContextImplicitObject.java?rev=690051&r1=690050&r2=690051&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/FacesContextImplicitObject.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/FacesContextImplicitObject.java Thu Aug 28 16:47:56 2008
@@ -19,7 +19,6 @@
package org.apache.myfaces.el.unified.resolver.implicitobject;
import java.beans.FeatureDescriptor;
-
import javax.el.ELContext;
import javax.faces.context.FacesContext;
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/HeaderImplicitObject.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/HeaderImplicitObject.java?rev=690051&r1=690050&r2=690051&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/HeaderImplicitObject.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/HeaderImplicitObject.java Thu Aug 28 16:47:56 2008
@@ -20,7 +20,6 @@
import java.beans.FeatureDescriptor;
import java.util.Map;
-
import javax.el.ELContext;
/**
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/HeaderValuesImplicitObject.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/HeaderValuesImplicitObject.java?rev=690051&r1=690050&r2=690051&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/HeaderValuesImplicitObject.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/HeaderValuesImplicitObject.java Thu Aug 28 16:47:56 2008
@@ -20,7 +20,6 @@
import java.beans.FeatureDescriptor;
import java.util.Map;
-
import javax.el.ELContext;
/**
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ImplicitObject.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ImplicitObject.java?rev=690051&r1=690050&r2=690051&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ImplicitObject.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ImplicitObject.java Thu Aug 28 16:47:56 2008
@@ -19,7 +19,6 @@
package org.apache.myfaces.el.unified.resolver.implicitobject;
import java.beans.FeatureDescriptor;
-
import javax.el.ELContext;
import javax.el.ELResolver;
import javax.faces.context.ExternalContext;
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ImplicitObjectResolver.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ImplicitObjectResolver.java?rev=690051&r1=690050&r2=690051&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ImplicitObjectResolver.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ImplicitObjectResolver.java Thu Aug 28 16:47:56 2008
@@ -18,18 +18,13 @@
*/
package org.apache.myfaces.el.unified.resolver.implicitobject;
+import javax.el.*;
import java.beans.FeatureDescriptor;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
-import javax.el.ELContext;
-import javax.el.ELException;
-import javax.el.ELResolver;
-import javax.el.PropertyNotFoundException;
-import javax.el.PropertyNotWritableException;
-
/**
* See JSF 1.2 spec sections 5.6.1.1 and 5.6.2.1
*
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/InitParamImplicitObject.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/InitParamImplicitObject.java?rev=690051&r1=690050&r2=690051&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/InitParamImplicitObject.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/InitParamImplicitObject.java Thu Aug 28 16:47:56 2008
@@ -20,7 +20,6 @@
import java.beans.FeatureDescriptor;
import java.util.Map;
-
import javax.el.ELContext;
/**
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ParamImplicitObject.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ParamImplicitObject.java?rev=690051&r1=690050&r2=690051&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ParamImplicitObject.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ParamImplicitObject.java Thu Aug 28 16:47:56 2008
@@ -20,7 +20,6 @@
import java.beans.FeatureDescriptor;
import java.util.Map;
-
import javax.el.ELContext;
/**
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ParamValuesImplicitObject.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ParamValuesImplicitObject.java?rev=690051&r1=690050&r2=690051&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ParamValuesImplicitObject.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ParamValuesImplicitObject.java Thu Aug 28 16:47:56 2008
@@ -20,7 +20,6 @@
import java.beans.FeatureDescriptor;
import java.util.Map;
-
import javax.el.ELContext;
/**
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/RequestImplicitObject.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/RequestImplicitObject.java?rev=690051&r1=690050&r2=690051&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/RequestImplicitObject.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/RequestImplicitObject.java Thu Aug 28 16:47:56 2008
@@ -19,7 +19,6 @@
package org.apache.myfaces.el.unified.resolver.implicitobject;
import java.beans.FeatureDescriptor;
-
import javax.el.ELContext;
/**
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/RequestScopeImplicitObject.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/RequestScopeImplicitObject.java?rev=690051&r1=690050&r2=690051&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/RequestScopeImplicitObject.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/RequestScopeImplicitObject.java Thu Aug 28 16:47:56 2008
@@ -18,11 +18,10 @@
*/
package org.apache.myfaces.el.unified.resolver.implicitobject;
+import javax.el.ELContext;
import java.beans.FeatureDescriptor;
import java.util.Map;
-import javax.el.ELContext;
-
/**
* Encapsulates information needed by the ImplicitObjectResolver
*
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/SessionImplicitObject.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/SessionImplicitObject.java?rev=690051&r1=690050&r2=690051&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/SessionImplicitObject.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/SessionImplicitObject.java Thu Aug 28 16:47:56 2008
@@ -19,7 +19,6 @@
package org.apache.myfaces.el.unified.resolver.implicitobject;
import java.beans.FeatureDescriptor;
-
import javax.el.ELContext;
/**
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/SessionScopeImplicitObject.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/SessionScopeImplicitObject.java?rev=690051&r1=690050&r2=690051&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/SessionScopeImplicitObject.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/SessionScopeImplicitObject.java Thu Aug 28 16:47:56 2008
@@ -18,11 +18,10 @@
*/
package org.apache.myfaces.el.unified.resolver.implicitobject;
+import javax.el.ELContext;
import java.beans.FeatureDescriptor;
import java.util.Map;
-import javax.el.ELContext;
-
/**
* Encapsulates information needed by the ImplicitObjectResolver
*
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ViewImplicitObject.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ViewImplicitObject.java?rev=690051&r1=690050&r2=690051&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ViewImplicitObject.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ViewImplicitObject.java Thu Aug 28 16:47:56 2008
@@ -19,7 +19,6 @@
package org.apache.myfaces.el.unified.resolver.implicitobject;
import java.beans.FeatureDescriptor;
-
import javax.el.ELContext;
import javax.faces.component.UIViewRoot;
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/lifecycle/DefaultRestoreViewSupport.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/lifecycle/DefaultRestoreViewSupport.java?rev=690051&r1=690050&r2=690051&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/lifecycle/DefaultRestoreViewSupport.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/lifecycle/DefaultRestoreViewSupport.java Thu Aug 28 16:47:56 2008
@@ -18,6 +18,7 @@
*/
package org.apache.myfaces.lifecycle;
+import java.util.Iterator;
import java.util.Map;
import javax.el.ValueExpression;
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/lifecycle/LifecycleFactoryImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/lifecycle/LifecycleFactoryImpl.java?rev=690051&r1=690050&r2=690051&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/lifecycle/LifecycleFactoryImpl.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/lifecycle/LifecycleFactoryImpl.java Thu Aug 28 16:47:56 2008
@@ -18,13 +18,12 @@
*/
package org.apache.myfaces.lifecycle;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
import javax.faces.FacesException;
import javax.faces.lifecycle.Lifecycle;
import javax.faces.lifecycle.LifecycleFactory;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
/**
* @author Manfred Geiler (latest modification by $Author$)
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/lifecycle/LifecycleImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/lifecycle/LifecycleImpl.java?rev=690051&r1=690050&r2=690051&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/lifecycle/LifecycleImpl.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/lifecycle/LifecycleImpl.java Thu Aug 28 16:47:56 2008
@@ -29,9 +29,9 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.myfaces.util.DebugUtils;
import org.apache.myfaces.config.FacesConfigurator;
import org.apache.myfaces.shared_impl.webapp.webxml.WebXml;
-import org.apache.myfaces.util.DebugUtils;
/**
* Implements the lifecycle as described in Spec. 1.0 PFD Chapter 2
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/lifecycle/PhaseListenerManager.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/lifecycle/PhaseListenerManager.java?rev=690051&r1=690050&r2=690051&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/lifecycle/PhaseListenerManager.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/lifecycle/PhaseListenerManager.java Thu Aug 28 16:47:56 2008
@@ -21,13 +21,11 @@
import java.util.HashMap;
import java.util.Map;
-
import javax.faces.context.FacesContext;
import javax.faces.event.PhaseEvent;
import javax.faces.event.PhaseId;
import javax.faces.event.PhaseListener;
import javax.faces.lifecycle.Lifecycle;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/renderkit/MyfacesResponseStateManager.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/renderkit/MyfacesResponseStateManager.java?rev=690051&r1=690050&r2=690051&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/renderkit/MyfacesResponseStateManager.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/renderkit/MyfacesResponseStateManager.java Thu Aug 28 16:47:56 2008
@@ -18,11 +18,10 @@
*/
package org.apache.myfaces.renderkit;
-import java.io.IOException;
-
import javax.faces.application.StateManager;
import javax.faces.context.FacesContext;
import javax.faces.render.ResponseStateManager;
+import java.io.IOException;
/**
* @author Manfred Geiler (latest modification by $Author$)
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/renderkit/RenderKitFactoryImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/renderkit/RenderKitFactoryImpl.java?rev=690051&r1=690050&r2=690051&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/renderkit/RenderKitFactoryImpl.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/renderkit/RenderKitFactoryImpl.java Thu Aug 28 16:47:56 2008
@@ -18,17 +18,16 @@
*/
package org.apache.myfaces.renderkit;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import javax.faces.FacesException;
import javax.faces.context.FacesContext;
import javax.faces.render.RenderKit;
import javax.faces.render.RenderKitFactory;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
/**
* RenderKitFactory implementation as defined in Spec. JSF.7.3
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlFormatRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlFormatRenderer.java?rev=690051&r1=690050&r2=690051&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlFormatRenderer.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlFormatRenderer.java Thu Aug 28 16:47:56 2008
@@ -18,24 +18,24 @@
*/
package org.apache.myfaces.renderkit.html;
-import java.io.IOException;
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
+import org.apache.myfaces.shared_impl.renderkit.JSFAttr;
+import org.apache.myfaces.shared_impl.renderkit.RendererUtils;
+import org.apache.myfaces.shared_impl.renderkit.html.HtmlRenderer;
+import org.apache.myfaces.shared_impl.renderkit.html.HtmlTextRendererBase;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import javax.faces.component.UIComponent;
import javax.faces.component.UIOutput;
import javax.faces.component.UIParameter;
import javax.faces.component.html.HtmlOutputFormat;
import javax.faces.context.FacesContext;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.shared_impl.renderkit.JSFAttr;
-import org.apache.myfaces.shared_impl.renderkit.RendererUtils;
-import org.apache.myfaces.shared_impl.renderkit.html.HtmlRenderer;
-import org.apache.myfaces.shared_impl.renderkit.html.HtmlTextRendererBase;
+import java.io.IOException;
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
/**
* @author Manfred Geiler (latest modification by $Author$)
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlHiddenRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlHiddenRenderer.java?rev=690051&r1=690050&r2=690051&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlHiddenRenderer.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlHiddenRenderer.java Thu Aug 28 16:47:56 2008
@@ -18,7 +18,11 @@
*/
package org.apache.myfaces.renderkit.html;
-import java.io.IOException;
+import org.apache.myfaces.shared_impl.renderkit.JSFAttr;
+import org.apache.myfaces.shared_impl.renderkit.RendererUtils;
+import org.apache.myfaces.shared_impl.renderkit.html.HTML;
+import org.apache.myfaces.shared_impl.renderkit.html.HtmlRenderer;
+import org.apache.myfaces.shared_impl.renderkit.html.HtmlRendererUtils;
import javax.faces.component.UIComponent;
import javax.faces.component.UIInput;
@@ -26,12 +30,7 @@
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
import javax.faces.convert.ConverterException;
-
-import org.apache.myfaces.shared_impl.renderkit.JSFAttr;
-import org.apache.myfaces.shared_impl.renderkit.RendererUtils;
-import org.apache.myfaces.shared_impl.renderkit.html.HTML;
-import org.apache.myfaces.shared_impl.renderkit.html.HtmlRenderer;
-import org.apache.myfaces.shared_impl.renderkit.html.HtmlRendererUtils;
+import java.io.IOException;
/**
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlMessageRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlMessageRenderer.java?rev=690051&r1=690050&r2=690051&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlMessageRenderer.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlMessageRenderer.java Thu Aug 28 16:47:56 2008
@@ -18,13 +18,12 @@
*/
package org.apache.myfaces.renderkit.html;
-import java.io.IOException;
+import org.apache.myfaces.shared_impl.renderkit.html.HtmlMessageRendererBase;
import javax.faces.application.FacesMessage;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
-
-import org.apache.myfaces.shared_impl.renderkit.html.HtmlMessageRendererBase;
+import java.io.IOException;
/**
* @author Manfred Geiler (latest modification by $Author$)
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlMessagesRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlMessagesRenderer.java?rev=690051&r1=690050&r2=690051&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlMessagesRenderer.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlMessagesRenderer.java Thu Aug 28 16:47:56 2008
@@ -18,13 +18,12 @@
*/
package org.apache.myfaces.renderkit.html;
-import java.io.IOException;
+import org.apache.myfaces.shared_impl.renderkit.html.HtmlMessagesRendererBase;
import javax.faces.application.FacesMessage;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
-
-import org.apache.myfaces.shared_impl.renderkit.html.HtmlMessagesRendererBase;
+import java.io.IOException;
/**
*
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlRenderKitImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlRenderKitImpl.java?rev=690051&r1=690050&r2=690051&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlRenderKitImpl.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlRenderKitImpl.java Thu Aug 28 16:47:56 2008
@@ -18,22 +18,21 @@
*/
package org.apache.myfaces.renderkit.html;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.Writer;
-import java.util.HashMap;
-import java.util.Map;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.myfaces.shared_impl.renderkit.html.HtmlRendererUtils;
+import org.apache.myfaces.shared_impl.renderkit.html.HtmlResponseWriterImpl;
import javax.faces.context.ResponseStream;
import javax.faces.context.ResponseWriter;
import javax.faces.render.RenderKit;
import javax.faces.render.Renderer;
import javax.faces.render.ResponseStateManager;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.shared_impl.renderkit.html.HtmlRendererUtils;
-import org.apache.myfaces.shared_impl.renderkit.html.HtmlResponseWriterImpl;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.Writer;
+import java.util.HashMap;
+import java.util.Map;
/**