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 00:42:01 UTC
svn commit: r690034 [3/3] - in /myfaces/core/branches/2_0_0:
api/src/main/java/javax/faces/ api/src/main/java/javax/faces/application/
api/src/main/java/javax/faces/component/
api/src/main/java/javax/faces/context/ api/src/main/java/javax/faces/el/
api...
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=690034&r1=690033&r2=690034&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 15:41:56 2008
@@ -20,6 +20,7 @@
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=690034&r1=690033&r2=690034&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 15:41:56 2008
@@ -19,6 +19,7 @@
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=690034&r1=690033&r2=690034&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 15:41:56 2008
@@ -18,13 +18,18 @@
*/
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=690034&r1=690033&r2=690034&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 15:41:56 2008
@@ -20,6 +20,7 @@
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=690034&r1=690033&r2=690034&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 15:41:56 2008
@@ -20,6 +20,7 @@
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=690034&r1=690033&r2=690034&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 15:41:56 2008
@@ -20,6 +20,7 @@
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=690034&r1=690033&r2=690034&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 15:41:56 2008
@@ -19,6 +19,7 @@
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=690034&r1=690033&r2=690034&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 15:41:56 2008
@@ -18,10 +18,11 @@
*/
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=690034&r1=690033&r2=690034&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 15:41:56 2008
@@ -19,6 +19,7 @@
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=690034&r1=690033&r2=690034&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 15:41:56 2008
@@ -18,10 +18,11 @@
*/
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=690034&r1=690033&r2=690034&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 15:41:56 2008
@@ -19,6 +19,7 @@
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=690034&r1=690033&r2=690034&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 15:41:56 2008
@@ -18,7 +18,6 @@
*/
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=690034&r1=690033&r2=690034&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 15:41:56 2008
@@ -18,13 +18,14 @@
*/
package org.apache.myfaces.lifecycle;
-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;
+import javax.faces.FacesException;
+import javax.faces.lifecycle.Lifecycle;
+import javax.faces.lifecycle.LifecycleFactory;
+
/**
* @author Manfred Geiler (latest modification by $Author$)
* @author Anton Koinov
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=690034&r1=690033&r2=690034&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 15:41: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=690034&r1=690033&r2=690034&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 15:41:56 2008
@@ -21,11 +21,13 @@
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=690034&r1=690033&r2=690034&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 15:41:56 2008
@@ -18,10 +18,11 @@
*/
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=690034&r1=690033&r2=690034&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 15:41:56 2008
@@ -18,16 +18,17 @@
*/
package org.apache.myfaces.renderkit;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
import javax.faces.FacesException;
import javax.faces.context.FacesContext;
import javax.faces.render.RenderKit;
import javax.faces.render.RenderKitFactory;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
/**
* 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=690034&r1=690033&r2=690034&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 15:41:56 2008
@@ -18,24 +18,24 @@
*/
package org.apache.myfaces.renderkit.html;
-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 java.io.IOException;
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
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 java.io.IOException;
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
+
+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;
/**
* @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=690034&r1=690033&r2=690034&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 15:41:56 2008
@@ -18,11 +18,7 @@
*/
package org.apache.myfaces.renderkit.html;
-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;
import javax.faces.component.UIComponent;
import javax.faces.component.UIInput;
@@ -30,7 +26,12 @@
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
import javax.faces.convert.ConverterException;
-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;
/**
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=690034&r1=690033&r2=690034&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 15:41:56 2008
@@ -18,12 +18,13 @@
*/
package org.apache.myfaces.renderkit.html;
-import org.apache.myfaces.shared_impl.renderkit.html.HtmlMessageRendererBase;
+import java.io.IOException;
import javax.faces.application.FacesMessage;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
-import java.io.IOException;
+
+import org.apache.myfaces.shared_impl.renderkit.html.HtmlMessageRendererBase;
/**
* @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=690034&r1=690033&r2=690034&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 15:41:56 2008
@@ -18,12 +18,13 @@
*/
package org.apache.myfaces.renderkit.html;
-import org.apache.myfaces.shared_impl.renderkit.html.HtmlMessagesRendererBase;
+import java.io.IOException;
import javax.faces.application.FacesMessage;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
-import java.io.IOException;
+
+import org.apache.myfaces.shared_impl.renderkit.html.HtmlMessagesRendererBase;
/**
*
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=690034&r1=690033&r2=690034&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 15:41:56 2008
@@ -18,21 +18,22 @@
*/
package org.apache.myfaces.renderkit.html;
-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;
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 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;
/**
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlResponseStateManager.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlResponseStateManager.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlResponseStateManager.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlResponseStateManager.java Thu Aug 28 15:41:56 2008
@@ -18,6 +18,15 @@
*/
package org.apache.myfaces.renderkit.html;
+import java.io.IOException;
+
+import javax.faces.application.StateManager;
+import javax.faces.context.ExternalContext;
+import javax.faces.context.FacesContext;
+import javax.faces.context.ResponseWriter;
+import javax.faces.render.RenderKitFactory;
+import javax.faces.render.ResponseStateManager;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.myfaces.renderkit.MyfacesResponseStateManager;
@@ -27,14 +36,6 @@
import org.apache.myfaces.shared_impl.renderkit.html.util.JavascriptUtils;
import org.apache.myfaces.shared_impl.util.StateUtils;
-import javax.faces.application.StateManager;
-import javax.faces.context.ExternalContext;
-import javax.faces.context.FacesContext;
-import javax.faces.context.ResponseWriter;
-import javax.faces.render.RenderKitFactory;
-import javax.faces.render.ResponseStateManager;
-import java.io.IOException;
-
/**
* @author Manfred Geiler (latest modification by $Author$)
* @version $Revision$ $Date$
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/taglib/core/AttributeTag.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/taglib/core/AttributeTag.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/taglib/core/AttributeTag.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/taglib/core/AttributeTag.java Thu Aug 28 15:41:56 2008
@@ -18,14 +18,14 @@
*/
package org.apache.myfaces.taglib.core;
-import javax.servlet.jsp.tagext.TagSupport;
-import javax.servlet.jsp.JspException;
-import javax.faces.webapp.UIComponentClassicTagBase;
-import javax.faces.webapp.UIComponentELTag;
+import javax.el.ELContext;
+import javax.el.ValueExpression;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
-import javax.el.ValueExpression;
-import javax.el.ELContext;
+import javax.faces.webapp.UIComponentClassicTagBase;
+import javax.faces.webapp.UIComponentELTag;
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.tagext.TagSupport;
/**
* @author Manfred Geiler (latest modification by $Author$)
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/taglib/core/ConvertDateTimeTag.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/taglib/core/ConvertDateTimeTag.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/taglib/core/ConvertDateTimeTag.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/taglib/core/ConvertDateTimeTag.java Thu Aug 28 15:41:56 2008
@@ -18,8 +18,8 @@
*/
package org.apache.myfaces.taglib.core;
-import org.apache.myfaces.shared_impl.taglib.UIComponentELTagUtils;
-import org.apache.myfaces.shared_impl.util.LocaleUtils;
+import java.util.Locale;
+import java.util.TimeZone;
import javax.el.ELContext;
import javax.el.ValueExpression;
@@ -27,8 +27,9 @@
import javax.faces.convert.Converter;
import javax.faces.convert.DateTimeConverter;
import javax.servlet.jsp.JspException;
-import java.util.Locale;
-import java.util.TimeZone;
+
+import org.apache.myfaces.shared_impl.taglib.UIComponentELTagUtils;
+import org.apache.myfaces.shared_impl.util.LocaleUtils;
/**
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/taglib/core/ConvertNumberTag.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/taglib/core/ConvertNumberTag.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/taglib/core/ConvertNumberTag.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/taglib/core/ConvertNumberTag.java Thu Aug 28 15:41:56 2008
@@ -19,7 +19,7 @@
package org.apache.myfaces.taglib.core;
-import org.apache.myfaces.shared_impl.taglib.UIComponentELTagUtils;
+import java.util.Locale;
import javax.el.ELContext;
import javax.el.ValueExpression;
@@ -28,7 +28,8 @@
import javax.faces.convert.NumberConverter;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.PageContext;
-import java.util.Locale;
+
+import org.apache.myfaces.shared_impl.taglib.UIComponentELTagUtils;
/**
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/taglib/core/DelegateValidator.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/taglib/core/DelegateValidator.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/taglib/core/DelegateValidator.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/taglib/core/DelegateValidator.java Thu Aug 28 15:41:56 2008
@@ -27,7 +27,6 @@
import javax.faces.context.FacesContext;
import javax.faces.validator.Validator;
import javax.faces.validator.ValidatorException;
-import javax.servlet.jsp.JspException;
/**
* This class is used in conjunction with ValidatorImplTag.
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/taglib/core/DelegateValueChangeListener.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/taglib/core/DelegateValueChangeListener.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/taglib/core/DelegateValueChangeListener.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/taglib/core/DelegateValueChangeListener.java Thu Aug 28 15:41:56 2008
@@ -24,8 +24,6 @@
import javax.faces.component.StateHolder;
import javax.faces.context.FacesContext;
import javax.faces.event.AbortProcessingException;
-import javax.faces.event.ActionEvent;
-import javax.faces.event.ActionListener;
import javax.faces.event.ValueChangeEvent;
import javax.faces.event.ValueChangeListener;
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/taglib/core/GenericListenerTag.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/taglib/core/GenericListenerTag.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/taglib/core/GenericListenerTag.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/taglib/core/GenericListenerTag.java Thu Aug 28 15:41:56 2008
@@ -18,19 +18,18 @@
*/
package org.apache.myfaces.taglib.core;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
-
import javax.el.ELException;
import javax.el.ValueExpression;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
-import javax.faces.event.ActionListener;
import javax.faces.webapp.UIComponentClassicTagBase;
import javax.faces.webapp.UIComponentELTag;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.Tag;
import javax.servlet.jsp.tagext.TagSupport;
+import org.apache.myfaces.shared_impl.util.ClassUtils;
+
/**
* @author Andreas Berger (latest modification by $Author$)
* @version $Revision$ $Date$
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/taglib/core/LoadBundleTag.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/taglib/core/LoadBundleTag.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/taglib/core/LoadBundleTag.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/taglib/core/LoadBundleTag.java Thu Aug 28 15:41:56 2008
@@ -29,12 +29,12 @@
import java.util.ResourceBundle;
import java.util.Set;
+import javax.el.ValueExpression;
import javax.faces.component.UIViewRoot;
import javax.faces.context.FacesContext;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.Tag;
import javax.servlet.jsp.tagext.TagSupport;
-import javax.el.ValueExpression;
/**
* TODO:
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/taglib/core/ParamTag.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/taglib/core/ParamTag.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/taglib/core/ParamTag.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/taglib/core/ParamTag.java Thu Aug 28 15:41:56 2008
@@ -18,10 +18,10 @@
*/
package org.apache.myfaces.taglib.core;
-import org.apache.myfaces.shared_impl.taglib.UIComponentELTagBase;
-
-import javax.faces.component.UIComponent;
import javax.el.ValueExpression;
+import javax.faces.component.UIComponent;
+
+import org.apache.myfaces.shared_impl.taglib.UIComponentELTagBase;
/**
* DOCUMENT ME!
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/taglib/core/PhaseListenerTag.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/taglib/core/PhaseListenerTag.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/taglib/core/PhaseListenerTag.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/taglib/core/PhaseListenerTag.java Thu Aug 28 15:41:56 2008
@@ -18,9 +18,7 @@
*/
package org.apache.myfaces.taglib.core;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
+import java.io.Serializable;
import javax.el.ValueExpression;
import javax.faces.FacesException;
@@ -34,7 +32,10 @@
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.Tag;
import javax.servlet.jsp.tagext.TagSupport;
-import java.io.Serializable;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.myfaces.shared_impl.util.ClassUtils;
/**
* @author martin.haimberger
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/taglib/core/SetPropertyActionListenerTag.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/taglib/core/SetPropertyActionListenerTag.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/taglib/core/SetPropertyActionListenerTag.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/taglib/core/SetPropertyActionListenerTag.java Thu Aug 28 15:41:56 2008
@@ -28,7 +28,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
import org.apache.myfaces.event.SetPropertyActionListener;
/**
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/taglib/core/SubviewTag.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/taglib/core/SubviewTag.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/taglib/core/SubviewTag.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/taglib/core/SubviewTag.java Thu Aug 28 15:41:56 2008
@@ -18,11 +18,11 @@
*/
package org.apache.myfaces.taglib.core;
-import javax.faces.webapp.UIComponentELTag;
import javax.faces.component.UIComponent;
import javax.faces.component.UINamingContainer;
import javax.faces.component.UIOutput;
import javax.faces.context.FacesContext;
+import javax.faces.webapp.UIComponentELTag;
import org.apache.myfaces.application.jsp.ViewResponseWrapper;
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/taglib/core/ValidateDoubleRangeTag.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/taglib/core/ValidateDoubleRangeTag.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/taglib/core/ValidateDoubleRangeTag.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/taglib/core/ValidateDoubleRangeTag.java Thu Aug 28 15:41:56 2008
@@ -18,12 +18,12 @@
*/
package org.apache.myfaces.taglib.core;
-import org.apache.myfaces.convert.ConverterUtils;
-
import javax.faces.validator.DoubleRangeValidator;
import javax.faces.validator.Validator;
import javax.servlet.jsp.JspException;
+import org.apache.myfaces.convert.ConverterUtils;
+
/**
* @author Thomas Spiegl (latest modification by $Author$)
* @author Manfred Geiler
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/taglib/core/ValidateLengthTag.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/taglib/core/ValidateLengthTag.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/taglib/core/ValidateLengthTag.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/taglib/core/ValidateLengthTag.java Thu Aug 28 15:41:56 2008
@@ -18,12 +18,12 @@
*/
package org.apache.myfaces.taglib.core;
-import org.apache.myfaces.convert.ConverterUtils;
-
import javax.faces.validator.LengthValidator;
import javax.faces.validator.Validator;
import javax.servlet.jsp.JspException;
+import org.apache.myfaces.convert.ConverterUtils;
+
/**
* @author Thomas Spiegl (latest modification by $Author$)
* @author Manfred Geiler
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/taglib/core/ValidateLongRangeTag.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/taglib/core/ValidateLongRangeTag.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/taglib/core/ValidateLongRangeTag.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/taglib/core/ValidateLongRangeTag.java Thu Aug 28 15:41:56 2008
@@ -18,12 +18,12 @@
*/
package org.apache.myfaces.taglib.core;
-import org.apache.myfaces.convert.ConverterUtils;
-
import javax.faces.validator.LongRangeValidator;
import javax.faces.validator.Validator;
import javax.servlet.jsp.JspException;
+import org.apache.myfaces.convert.ConverterUtils;
+
/**
* @author Thomas Spiegl (latest modification by $Author$)
* @author Manfred Geiler
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/taglib/core/ValueChangeListenerTag.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/taglib/core/ValueChangeListenerTag.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/taglib/core/ValueChangeListenerTag.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/taglib/core/ValueChangeListenerTag.java Thu Aug 28 15:41:56 2008
@@ -20,7 +20,6 @@
import javax.el.ValueExpression;
import javax.faces.component.EditableValueHolder;
-import javax.faces.event.ActionListener;
import javax.faces.event.ValueChangeListener;
/**
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/taglib/core/VerbatimTag.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/taglib/core/VerbatimTag.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/taglib/core/VerbatimTag.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/taglib/core/VerbatimTag.java Thu Aug 28 15:41:56 2008
@@ -18,15 +18,15 @@
*/
package org.apache.myfaces.taglib.core;
-import org.apache.myfaces.shared_impl.renderkit.JSFAttr;
-import org.apache.myfaces.shared_impl.taglib.UIComponentELTagBase;
-
import javax.el.ValueExpression;
import javax.faces.component.UIComponent;
import javax.faces.component.UIOutput;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.BodyContent;
+import org.apache.myfaces.shared_impl.renderkit.JSFAttr;
+import org.apache.myfaces.shared_impl.taglib.UIComponentELTagBase;
+
/**
* @author Manfred Geiler (latest modification by $Author$)
* @version $Revision$ $Date$
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/taglib/core/ViewTag.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/taglib/core/ViewTag.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/taglib/core/ViewTag.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/taglib/core/ViewTag.java Thu Aug 28 15:41:56 2008
@@ -18,10 +18,8 @@
*/
package org.apache.myfaces.taglib.core;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.application.jsp.ViewResponseWrapper;
-import org.apache.myfaces.shared_impl.util.LocaleUtils;
+import java.io.IOException;
+import java.util.Locale;
import javax.el.ELContext;
import javax.el.MethodExpression;
@@ -34,8 +32,11 @@
import javax.faces.webapp.UIComponentELTag;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.jstl.core.Config;
-import java.io.IOException;
-import java.util.Locale;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.myfaces.application.jsp.ViewResponseWrapper;
+import org.apache.myfaces.shared_impl.util.LocaleUtils;
/**
* @author Manfred Geiler (latest modification by $Author$)
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/util/ContainerUtils.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/util/ContainerUtils.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/util/ContainerUtils.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/util/ContainerUtils.java Thu Aug 28 15:41:56 2008
@@ -18,6 +18,8 @@
*/
package org.apache.myfaces.util;
+import javax.faces.webapp.UIComponentTag;
+
/**
* Utilities for determining the current container and for the unified
* expression language.
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/util/DebugUtils.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/util/DebugUtils.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/util/DebugUtils.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/util/DebugUtils.java Thu Aug 28 15:41:56 2008
@@ -18,16 +18,6 @@
*/
package org.apache.myfaces.util;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import javax.faces.FacesException;
-import javax.faces.component.*;
-import javax.faces.context.FacesContext;
-import javax.faces.el.MethodBinding;
-import javax.faces.el.ValueBinding;
-import javax.faces.event.FacesListener;
-import javax.faces.validator.Validator;
import java.beans.BeanInfo;
import java.beans.IntrospectionException;
import java.beans.Introspector;
@@ -39,6 +29,21 @@
import java.util.Iterator;
import java.util.Map;
+import javax.faces.FacesException;
+import javax.faces.component.UICommand;
+import javax.faces.component.UIComponent;
+import javax.faces.component.UIInput;
+import javax.faces.component.UIViewRoot;
+import javax.faces.component.ValueHolder;
+import javax.faces.context.FacesContext;
+import javax.faces.el.MethodBinding;
+import javax.faces.el.ValueBinding;
+import javax.faces.event.FacesListener;
+import javax.faces.validator.Validator;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
/**
* Utilities for logging.
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/webapp/AbstractMyFacesListener.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/webapp/AbstractMyFacesListener.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/webapp/AbstractMyFacesListener.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/webapp/AbstractMyFacesListener.java Thu Aug 28 15:41:56 2008
@@ -18,15 +18,15 @@
*/
package org.apache.myfaces.webapp;
+import java.lang.reflect.InvocationTargetException;
+
import javax.servlet.ServletContextAttributeEvent;
import javax.servlet.ServletRequestAttributeEvent;
import javax.servlet.http.HttpSessionBindingEvent;
-import org.apache.myfaces.config.annotation.LifecycleProviderFactory;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
-import java.lang.reflect.InvocationTargetException;
+import org.apache.myfaces.config.annotation.LifecycleProviderFactory;
/**
* @author Dennis Byrne
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/webapp/MyFacesServlet.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/webapp/MyFacesServlet.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/webapp/MyFacesServlet.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/webapp/MyFacesServlet.java Thu Aug 28 15:41:56 2008
@@ -18,15 +18,21 @@
*/
package org.apache.myfaces.webapp;
+import java.io.IOException;
+
+import javax.faces.webapp.FacesServlet;
+import javax.servlet.Servlet;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.myfaces.shared_impl.webapp.webxml.DelegatedFacesServlet;
import org.apache.myfaces.util.ContainerUtils;
-import javax.faces.webapp.FacesServlet;
-import javax.servlet.*;
-import java.io.IOException;
-
/**
* Derived FacesServlet that can be used for debugging purpose
* and to fix the Weblogic startup issue (FacesServlet is initialized before ServletContextListener).
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/webapp/StartupServletContextListener.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/webapp/StartupServletContextListener.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/webapp/StartupServletContextListener.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/webapp/StartupServletContextListener.java Thu Aug 28 15:41:56 2008
@@ -20,16 +20,16 @@
import java.util.Enumeration;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.config.ManagedBeanBuilder;
-import org.apache.myfaces.util.ContainerUtils;
-
import javax.faces.FactoryFinder;
import javax.servlet.ServletContext;
import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.myfaces.config.ManagedBeanBuilder;
+import org.apache.myfaces.util.ContainerUtils;
+
/**
* Initialise the MyFaces system.
* <p>
Modified: myfaces/core/branches/2_0_0/impl/src/test/java/org/apache/myfaces/application/ApplicationImplTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/test/java/org/apache/myfaces/application/ApplicationImplTest.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/test/java/org/apache/myfaces/application/ApplicationImplTest.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/test/java/org/apache/myfaces/application/ApplicationImplTest.java Thu Aug 28 15:41:56 2008
@@ -76,7 +76,7 @@
/**
* Test method for
- * {@link org.apache.myfaces.application.ApplicationImpl#getResourceBundle(javax.faces.context.FacesContext, java.lang.String)}.
+ * {@link org.apache.myfaces.application.ApplicationImpl#getResourceBundle(javax.faces.context.FacesContext, String)}.
*/
public void testGetResourceBundleNPE()
{
@@ -101,7 +101,7 @@
* Test if a {@link FacesException} is thrown if the specified resource bundle can not be found.
* </p>
* Test method for
- * {@link org.apache.myfaces.application.ApplicationImpl#getResourceBundle(javax.faces.context.FacesContext, java.lang.String)}.
+ * {@link org.apache.myfaces.application.ApplicationImpl#getResourceBundle(javax.faces.context.FacesContext, String)}.
*/
public void testGetResourceBundleFacesException()
{
@@ -124,7 +124,7 @@
/**
* Test method for
- * {@link org.apache.myfaces.application.ApplicationImpl#getResourceBundle(javax.faces.context.FacesContext, java.lang.String)}.
+ * {@link org.apache.myfaces.application.ApplicationImpl#getResourceBundle(javax.faces.context.FacesContext, String)}.
*/
public void testGetResourceBundleWithDefaultLocale()
{
@@ -133,7 +133,7 @@
/**
* Test method for
- * {@link org.apache.myfaces.application.ApplicationImpl#getResourceBundle(javax.faces.context.FacesContext, java.lang.String)}.
+ * {@link org.apache.myfaces.application.ApplicationImpl#getResourceBundle(javax.faces.context.FacesContext, String)}.
*/
public void testGetResourceBundleWithUIViewRootLocale()
{
@@ -233,7 +233,7 @@
/**
* Test method for
- * {@link javax.faces.application.Application#createConverter(java.lang.Class)}.
+ * {@link javax.faces.application.Application#createConverter(Class)}.
*/
public void testCreateEnumConverter() throws Exception
{
Modified: myfaces/core/branches/2_0_0/impl/src/test/java/org/apache/myfaces/application/DefaultViewHandlerSupportTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/test/java/org/apache/myfaces/application/DefaultViewHandlerSupportTest.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/test/java/org/apache/myfaces/application/DefaultViewHandlerSupportTest.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/test/java/org/apache/myfaces/application/DefaultViewHandlerSupportTest.java Thu Aug 28 15:41:56 2008
@@ -18,7 +18,8 @@
*/
package org.apache.myfaces.application;
-import static org.easymock.EasyMock.*;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.same;
import java.lang.reflect.Method;
@@ -41,7 +42,7 @@
/**
* Test method for
- * {@link org.apache.myfaces.application.DefaultViewHandlerSupport#calculateViewId(javax.faces.context.FacesContext, java.lang.String)}.
+ * {@link org.apache.myfaces.application.DefaultViewHandlerSupport#calculateViewId(javax.faces.context.FacesContext, String)}.
*
* @throws Exception
*/
@@ -76,7 +77,7 @@
/**
* Test method for
- * {@link org.apache.myfaces.application.DefaultViewHandlerSupport#applyDefaultSuffix(javax.faces.context.FacesContext, java.lang.String)}.
+ * {@link org.apache.myfaces.application.DefaultViewHandlerSupport#applyDefaultSuffix(javax.faces.context.FacesContext, String)}.
*/
public void testApplyDefaultSuffix()
{
@@ -85,7 +86,7 @@
/**
* Test method for
- * {@link org.apache.myfaces.application.DefaultViewHandlerSupport#calculateActionURL(javax.faces.context.FacesContext, java.lang.String)}.
+ * {@link org.apache.myfaces.application.DefaultViewHandlerSupport#calculateActionURL(javax.faces.context.FacesContext, String)}.
*
* @throws
* @throws Exception
Modified: myfaces/core/branches/2_0_0/impl/src/test/java/org/apache/myfaces/application/jsp/JspViewHandlerImplTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/test/java/org/apache/myfaces/application/jsp/JspViewHandlerImplTest.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/test/java/org/apache/myfaces/application/jsp/JspViewHandlerImplTest.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/test/java/org/apache/myfaces/application/jsp/JspViewHandlerImplTest.java Thu Aug 28 15:41:56 2008
@@ -232,7 +232,7 @@
/**
* Test method for
- * {@link org.apache.myfaces.application.jsp.JspViewHandlerImpl#createView(javax.faces.context.FacesContext, java.lang.String)}.
+ * {@link org.apache.myfaces.application.jsp.JspViewHandlerImpl#createView(javax.faces.context.FacesContext, String)}.
*/
public void testCreateView()
{
@@ -261,7 +261,7 @@
/**
* Test method for
- * {@link org.apache.myfaces.application.jsp.JspViewHandlerImpl#createView(javax.faces.context.FacesContext, java.lang.String)}.
+ * {@link org.apache.myfaces.application.jsp.JspViewHandlerImpl#createView(javax.faces.context.FacesContext, String)}.
*
* @throws Exception
*/
@@ -300,7 +300,7 @@
/**
* Test method for
- * {@link org.apache.myfaces.application.jsp.JspViewHandlerImpl#createView(javax.faces.context.FacesContext, java.lang.String)}.
+ * {@link org.apache.myfaces.application.jsp.JspViewHandlerImpl#createView(javax.faces.context.FacesContext, String)}.
*/
public void testCreateViewWithExistingViewRoot()
{
@@ -331,7 +331,7 @@
/**
* Test method for
- * {@link org.apache.myfaces.application.jsp.JspViewHandlerImpl#getActionURL(javax.faces.context.FacesContext, java.lang.String)}.
+ * {@link org.apache.myfaces.application.jsp.JspViewHandlerImpl#getActionURL(javax.faces.context.FacesContext, String)}.
*/
public void testGetActionURL()
{
@@ -340,7 +340,7 @@
/**
* Test method for
- * {@link org.apache.myfaces.application.jsp.JspViewHandlerImpl#getResourceURL(javax.faces.context.FacesContext, java.lang.String)}.
+ * {@link org.apache.myfaces.application.jsp.JspViewHandlerImpl#getResourceURL(javax.faces.context.FacesContext, String)}.
*/
public void testGetResourceURL()
{
@@ -358,7 +358,7 @@
/**
* Test method for
- * {@link org.apache.myfaces.application.jsp.JspViewHandlerImpl#restoreView(javax.faces.context.FacesContext, java.lang.String)}.
+ * {@link org.apache.myfaces.application.jsp.JspViewHandlerImpl#restoreView(javax.faces.context.FacesContext, String)}.
*/
public void testRestoreView()
{
Modified: myfaces/core/branches/2_0_0/impl/src/test/java/org/apache/myfaces/config/annotation/AnnotationProcessorTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/test/java/org/apache/myfaces/config/annotation/AnnotationProcessorTestCase.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/test/java/org/apache/myfaces/config/annotation/AnnotationProcessorTestCase.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/test/java/org/apache/myfaces/config/annotation/AnnotationProcessorTestCase.java Thu Aug 28 15:41:56 2008
@@ -17,10 +17,11 @@
* limitations under the License.
*/
-import org.apache.shale.test.base.AbstractJsfTestCase;
+import java.lang.reflect.InvocationTargetException;
import javax.naming.NamingException;
-import java.lang.reflect.InvocationTargetException;
+
+import org.apache.shale.test.base.AbstractJsfTestCase;
public class AnnotationProcessorTestCase extends AbstractJsfTestCase
Modified: myfaces/core/branches/2_0_0/impl/src/test/java/org/apache/myfaces/config/annotation/TestDiscoverableLifecycleProvider.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/test/java/org/apache/myfaces/config/annotation/TestDiscoverableLifecycleProvider.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/test/java/org/apache/myfaces/config/annotation/TestDiscoverableLifecycleProvider.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/test/java/org/apache/myfaces/config/annotation/TestDiscoverableLifecycleProvider.java Thu Aug 28 15:41:56 2008
@@ -18,9 +18,10 @@
*/
-import javax.naming.NamingException;
import java.lang.reflect.InvocationTargetException;
+import javax.naming.NamingException;
+
public class TestDiscoverableLifecycleProvider implements DiscoverableLifecycleProvider
Modified: myfaces/core/branches/2_0_0/impl/src/test/java/org/apache/myfaces/config/annotation/TestLifecycleProvider.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/test/java/org/apache/myfaces/config/annotation/TestLifecycleProvider.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/test/java/org/apache/myfaces/config/annotation/TestLifecycleProvider.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/test/java/org/apache/myfaces/config/annotation/TestLifecycleProvider.java Thu Aug 28 15:41:56 2008
@@ -18,9 +18,10 @@
*/
-import javax.naming.NamingException;
import java.lang.reflect.InvocationTargetException;
+import javax.naming.NamingException;
+
public class TestLifecycleProvider implements LifecycleProvider
{
Modified: myfaces/core/branches/2_0_0/impl/src/test/java/org/apache/myfaces/el/convert/ValueBindingToValueExpressionTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/test/java/org/apache/myfaces/el/convert/ValueBindingToValueExpressionTest.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/test/java/org/apache/myfaces/el/convert/ValueBindingToValueExpressionTest.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/test/java/org/apache/myfaces/el/convert/ValueBindingToValueExpressionTest.java Thu Aug 28 15:41:56 2008
@@ -75,7 +75,7 @@
}
/**
- * Test method for {@link org.apache.myfaces.el.convert.ValueBindingToValueExpression#equals(java.lang.Object)}.
+ * Test method for {@link org.apache.myfaces.el.convert.ValueBindingToValueExpression#equals(Object)}.
*/
public void testEqualsObject()
{
@@ -204,7 +204,7 @@
/**
* Test method for
- * {@link org.apache.myfaces.el.convert.ValueBindingToValueExpression#setValue(javax.el.ELContext, java.lang.Object)}.
+ * {@link org.apache.myfaces.el.convert.ValueBindingToValueExpression#setValue(javax.el.ELContext, Object)}.
*/
public void testSetValueELContextObject()
{
@@ -218,7 +218,7 @@
/**
* Test method for
- * {@link org.apache.myfaces.el.convert.ValueBindingToValueExpression#setValue(javax.el.ELContext, java.lang.Object)}.
+ * {@link org.apache.myfaces.el.convert.ValueBindingToValueExpression#setValue(javax.el.ELContext, Object)}.
*/
public void testSetValueELContextObjectExceptions() throws Exception
{
Modified: myfaces/core/branches/2_0_0/impl/src/test/java/org/apache/myfaces/el/convert/ValueExpressionToValueBindingTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/test/java/org/apache/myfaces/el/convert/ValueExpressionToValueBindingTest.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/test/java/org/apache/myfaces/el/convert/ValueExpressionToValueBindingTest.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/test/java/org/apache/myfaces/el/convert/ValueExpressionToValueBindingTest.java Thu Aug 28 15:41:56 2008
@@ -226,7 +226,7 @@
/**
* Test method for
- * {@link org.apache.myfaces.el.convert.ValueExpressionToValueBinding#setValue(javax.faces.context.FacesContext, java.lang.Object)}.
+ * {@link org.apache.myfaces.el.convert.ValueExpressionToValueBinding#setValue(javax.faces.context.FacesContext, Object)}.
*/
public void testSetValue()
{
@@ -240,7 +240,7 @@
/**
* Test method for
- * {@link org.apache.myfaces.el.convert.ValueExpressionToValueBinding#setValue(javax.faces.context.FacesContext, java.lang.Object)}.
+ * {@link org.apache.myfaces.el.convert.ValueExpressionToValueBinding#setValue(javax.faces.context.FacesContext, Object)}.
*/
public void testSetValueExceptions()
{