[seam-commits] Seam SVN: r9621 - in trunk/src/main/org/jboss/seam: contexts and 10 other directories.

Author: dan.j.allen Date: 2008-11-24 12:31:44 -0500 (Mon, 24 Nov 2008) New Revision: 9621 Modified: trunk/src/main/org/jboss/seam/annotations/Begin.java trunk/src/main/org/jboss/seam/annotations/Logger.java trunk/src/main/org/jboss/seam/annotations/Out.java trunk/src/main/org/jboss/seam/contexts/FacesLifecycle.java trunk/src/main/org/jboss/seam/core/EventInterceptor.java trunk/src/main/org/jboss/seam/document/DocumentStore.java trunk/src/main/org/jboss/seam/drools/DroolsActionHandler.java trunk/src/main/org/jboss/seam/drools/DroolsAssignmentHandler.java trunk/src/main/org/jboss/seam/drools/DroolsDecisionHandler.java trunk/src/main/org/jboss/seam/init/NamespacePackageResolver.java trunk/src/main/org/jboss/seam/mock/AbstractSeamTest.java trunk/src/main/org/jboss/seam/mock/MockViewHandler.java trunk/src/main/org/jboss/seam/security/EntityPermissionChecker.java trunk/src/main/org/jboss/seam/security/management/action/UserSearch.java trunk/src/main/org/jboss/seam/security/openid/OpenId.java trunk/src/main/org/jboss/seam/security/openid/OpenIdPhaseListener.java trunk/src/main/org/jboss/seam/security/permission/PermissionMetadata.java trunk/src/main/org/jboss/seam/web/AuthenticationFilter.java trunk/src/main/org/jboss/seam/web/IdentityFilter.java trunk/src/main/org/jboss/seam/web/IdentityRequestWrapper.java Log: JBSEAM-3746 Modified: trunk/src/main/org/jboss/seam/annotations/Begin.java =================================================================== --- trunk/src/main/org/jboss/seam/annotations/Begin.java 2008-11-24 17:14:35 UTC (rev 9620) +++ trunk/src/main/org/jboss/seam/annotations/Begin.java 2008-11-24 17:31:44 UTC (rev 9621) @@ -2,6 +2,7 @@ package org.jboss.seam.annotations; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.RetentionPolicy.RUNTIME; + import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; Modified: trunk/src/main/org/jboss/seam/annotations/Logger.java =================================================================== --- trunk/src/main/org/jboss/seam/annotations/Logger.java 2008-11-24 17:14:35 UTC (rev 9620) +++ trunk/src/main/org/jboss/seam/annotations/Logger.java 2008-11-24 17:31:44 UTC (rev 9621) @@ -1,7 +1,7 @@ //$Id$ package org.jboss.seam.annotations; -import static java.lang.annotation.ElementType.*; +import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Documented; Modified: trunk/src/main/org/jboss/seam/annotations/Out.java =================================================================== --- trunk/src/main/org/jboss/seam/annotations/Out.java 2008-11-24 17:14:35 UTC (rev 9620) +++ trunk/src/main/org/jboss/seam/annotations/Out.java 2008-11-24 17:31:44 UTC (rev 9621) @@ -6,15 +6,16 @@ */ package org.jboss.seam.annotations; +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; import org.jboss.seam.ScopeType; -import static java.lang.annotation.ElementType.*; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - /** * Specifies that a seam component should be outjected from * the annotated field or getter method of a session bean. Modified: trunk/src/main/org/jboss/seam/contexts/FacesLifecycle.java =================================================================== --- trunk/src/main/org/jboss/seam/contexts/FacesLifecycle.java 2008-11-24 17:14:35 UTC (rev 9620) +++ trunk/src/main/org/jboss/seam/contexts/FacesLifecycle.java 2008-11-24 17:31:44 UTC (rev 9621) @@ -11,7 +11,6 @@ import javax.faces.context.ExternalContext; import javax.faces.context.FacesContext; import javax.faces.event.PhaseId; -import javax.servlet.ServletRequest; import org.jboss.seam.ScopeType; import org.jboss.seam.log.LogProvider; Modified: trunk/src/main/org/jboss/seam/core/EventInterceptor.java =================================================================== --- trunk/src/main/org/jboss/seam/core/EventInterceptor.java 2008-11-24 17:14:35 UTC (rev 9620) +++ trunk/src/main/org/jboss/seam/core/EventInterceptor.java 2008-11-24 17:31:44 UTC (rev 9621) @@ -1,6 +1,7 @@ package org.jboss.seam.core; import java.lang.reflect.Method; + import org.jboss.seam.annotations.RaiseEvent; import org.jboss.seam.annotations.intercept.AroundInvoke; import org.jboss.seam.annotations.intercept.Interceptor; Modified: trunk/src/main/org/jboss/seam/document/DocumentStore.java =================================================================== --- trunk/src/main/org/jboss/seam/document/DocumentStore.java 2008-11-24 17:14:35 UTC (rev 9620) +++ trunk/src/main/org/jboss/seam/document/DocumentStore.java 2008-11-24 17:31:44 UTC (rev 9621) @@ -4,7 +4,6 @@ import java.util.HashMap; import java.util.Map; -import javax.faces.FacesException; import javax.faces.application.ViewHandler; import javax.faces.context.FacesContext; Modified: trunk/src/main/org/jboss/seam/drools/DroolsActionHandler.java =================================================================== --- trunk/src/main/org/jboss/seam/drools/DroolsActionHandler.java 2008-11-24 17:14:35 UTC (rev 9620) +++ trunk/src/main/org/jboss/seam/drools/DroolsActionHandler.java 2008-11-24 17:31:44 UTC (rev 9621) @@ -1,6 +1,7 @@ package org.jboss.seam.drools; import java.util.List; + import org.jbpm.graph.def.ActionHandler; import org.jbpm.graph.exe.ExecutionContext; Modified: trunk/src/main/org/jboss/seam/drools/DroolsAssignmentHandler.java =================================================================== --- trunk/src/main/org/jboss/seam/drools/DroolsAssignmentHandler.java 2008-11-24 17:14:35 UTC (rev 9620) +++ trunk/src/main/org/jboss/seam/drools/DroolsAssignmentHandler.java 2008-11-24 17:31:44 UTC (rev 9621) @@ -1,6 +1,7 @@ package org.jboss.seam.drools; import java.util.List; + import org.drools.WorkingMemory; import org.jbpm.graph.exe.ExecutionContext; import org.jbpm.taskmgmt.def.AssignmentHandler; Modified: trunk/src/main/org/jboss/seam/drools/DroolsDecisionHandler.java =================================================================== --- trunk/src/main/org/jboss/seam/drools/DroolsDecisionHandler.java 2008-11-24 17:14:35 UTC (rev 9620) +++ trunk/src/main/org/jboss/seam/drools/DroolsDecisionHandler.java 2008-11-24 17:31:44 UTC (rev 9621) @@ -1,6 +1,7 @@ package org.jboss.seam.drools; import java.util.List; + import org.drools.WorkingMemory; import org.jbpm.graph.exe.ExecutionContext; import org.jbpm.graph.node.DecisionHandler; Modified: trunk/src/main/org/jboss/seam/init/NamespacePackageResolver.java =================================================================== --- trunk/src/main/org/jboss/seam/init/NamespacePackageResolver.java 2008-11-24 17:14:35 UTC (rev 9620) +++ trunk/src/main/org/jboss/seam/init/NamespacePackageResolver.java 2008-11-24 17:31:44 UTC (rev 9621) @@ -6,11 +6,9 @@ package org.jboss.seam.init; import java.net.URI; -import java.net.URISyntaxException; import org.jboss.seam.log.LogProvider; import org.jboss.seam.log.Logging; -import org.testng.Assert; /** * <p>Converts an <a href="http://www.w3.org/TR/xml-names/">XML namespace</a> to a Java package name.</p> Modified: trunk/src/main/org/jboss/seam/mock/AbstractSeamTest.java =================================================================== --- trunk/src/main/org/jboss/seam/mock/AbstractSeamTest.java 2008-11-24 17:14:35 UTC (rev 9620) +++ trunk/src/main/org/jboss/seam/mock/AbstractSeamTest.java 2008-11-24 17:31:44 UTC (rev 9621) @@ -51,7 +51,6 @@ import org.jboss.seam.faces.FacesMessages; import org.jboss.seam.faces.Renderer; import org.jboss.seam.init.Initialization; -import org.jboss.seam.jsf.SeamApplication; import org.jboss.seam.jsf.SeamPhaseListener; import org.jboss.seam.mail.MailSession; import org.jboss.seam.pageflow.Pageflow; Modified: trunk/src/main/org/jboss/seam/mock/MockViewHandler.java =================================================================== --- trunk/src/main/org/jboss/seam/mock/MockViewHandler.java 2008-11-24 17:14:35 UTC (rev 9620) +++ trunk/src/main/org/jboss/seam/mock/MockViewHandler.java 2008-11-24 17:31:44 UTC (rev 9621) @@ -8,7 +8,6 @@ import javax.faces.component.UIViewRoot; import javax.faces.context.FacesContext; -import org.jboss.seam.util.Faces; import org.jboss.seam.util.Strings; public class MockViewHandler extends ViewHandler { Modified: trunk/src/main/org/jboss/seam/security/EntityPermissionChecker.java =================================================================== --- trunk/src/main/org/jboss/seam/security/EntityPermissionChecker.java 2008-11-24 17:14:35 UTC (rev 9620) +++ trunk/src/main/org/jboss/seam/security/EntityPermissionChecker.java 2008-11-24 17:31:44 UTC (rev 9621) @@ -9,7 +9,6 @@ import org.jboss.seam.Component; import org.jboss.seam.ScopeType; -import org.jboss.seam.Seam; import org.jboss.seam.annotations.Install; import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Scope; Modified: trunk/src/main/org/jboss/seam/security/management/action/UserSearch.java =================================================================== --- trunk/src/main/org/jboss/seam/security/management/action/UserSearch.java 2008-11-24 17:14:35 UTC (rev 9620) +++ trunk/src/main/org/jboss/seam/security/management/action/UserSearch.java 2008-11-24 17:31:44 UTC (rev 9621) @@ -12,7 +12,6 @@ import org.jboss.seam.annotations.Scope; import org.jboss.seam.annotations.datamodel.DataModel; import org.jboss.seam.annotations.datamodel.DataModelSelection; - import org.jboss.seam.security.management.IdentityManager; @Name("org.jboss.seam.security.management.userSearch") Modified: trunk/src/main/org/jboss/seam/security/openid/OpenId.java =================================================================== --- trunk/src/main/org/jboss/seam/security/openid/OpenId.java 2008-11-24 17:14:35 UTC (rev 9620) +++ trunk/src/main/org/jboss/seam/security/openid/OpenId.java 2008-11-24 17:31:44 UTC (rev 9621) @@ -1,27 +1,34 @@ package org.jboss.seam.security.openid; +import java.io.IOException; import java.io.Serializable; - -import org.openid4java.*; -import org.openid4java.consumer.*; -import org.openid4java.discovery.*; -import org.openid4java.message.*; -import org.openid4java.message.ax.*; - import java.util.List; -import java.io.IOException; -import javax.servlet.http.*; - -import org.jboss.seam.annotations.*; -import org.jboss.seam.*; -import org.jboss.seam.faces.*; -import org.jboss.seam.core.*; -import org.jboss.seam.security.*; - import javax.faces.context.ExternalContext; import javax.faces.context.FacesContext; +import javax.servlet.http.HttpServletRequest; +import org.jboss.seam.ScopeType; +import org.jboss.seam.annotations.Create; +import org.jboss.seam.annotations.Install; +import org.jboss.seam.annotations.Name; +import org.jboss.seam.annotations.Scope; +import org.jboss.seam.faces.FacesManager; +import org.jboss.seam.faces.Redirect; +import org.jboss.seam.security.Identity; +import org.openid4java.OpenIDException; +import org.openid4java.consumer.ConsumerException; +import org.openid4java.consumer.ConsumerManager; +import org.openid4java.consumer.VerificationResult; +import org.openid4java.discovery.DiscoveryInformation; +import org.openid4java.discovery.Identifier; +import org.openid4java.message.AuthRequest; +import org.openid4java.message.AuthSuccess; +import org.openid4java.message.ParameterList; +import org.openid4java.message.ax.AxMessage; +import org.openid4java.message.ax.FetchRequest; +import org.openid4java.message.ax.FetchResponse; + @Name("openid") @Install(precedence=Install.BUILT_IN, classDependencies="org.openid4java.consumer.ConsumerManager") @Scope(ScopeType.SESSION) Modified: trunk/src/main/org/jboss/seam/security/openid/OpenIdPhaseListener.java =================================================================== --- trunk/src/main/org/jboss/seam/security/openid/OpenIdPhaseListener.java 2008-11-24 17:14:35 UTC (rev 9620) +++ trunk/src/main/org/jboss/seam/security/openid/OpenIdPhaseListener.java 2008-11-24 17:31:44 UTC (rev 9621) @@ -1,11 +1,16 @@ package org.jboss.seam.security.openid; -import javax.faces.context.*; -import javax.faces.event.*; -import javax.servlet.http.*; -import java.io.*; +import java.io.IOException; +import java.io.PrintWriter; +import javax.faces.context.ExternalContext; +import javax.faces.context.FacesContext; +import javax.faces.event.PhaseEvent; +import javax.faces.event.PhaseId; +import javax.faces.event.PhaseListener; +import javax.servlet.http.HttpServletResponse; + import org.jboss.seam.Component; import org.jboss.seam.navigation.Pages; Modified: trunk/src/main/org/jboss/seam/security/permission/PermissionMetadata.java =================================================================== --- trunk/src/main/org/jboss/seam/security/permission/PermissionMetadata.java 2008-11-24 17:14:35 UTC (rev 9620) +++ trunk/src/main/org/jboss/seam/security/permission/PermissionMetadata.java 2008-11-24 17:31:44 UTC (rev 9621) @@ -3,7 +3,6 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; -import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; Modified: trunk/src/main/org/jboss/seam/web/AuthenticationFilter.java =================================================================== --- trunk/src/main/org/jboss/seam/web/AuthenticationFilter.java 2008-11-24 17:14:35 UTC (rev 9620) +++ trunk/src/main/org/jboss/seam/web/AuthenticationFilter.java 2008-11-24 17:31:44 UTC (rev 9621) @@ -33,7 +33,6 @@ import org.jboss.seam.servlet.ContextualHttpServletRequest; import org.jboss.seam.servlet.ServletRequestSessionMap; import org.jboss.seam.util.Base64; -import org.jboss.seam.util.Strings; /** * Seam Servlet Filter supporting HTTP Basic and Digest authentication. Some code Modified: trunk/src/main/org/jboss/seam/web/IdentityFilter.java =================================================================== --- trunk/src/main/org/jboss/seam/web/IdentityFilter.java 2008-11-24 17:14:35 UTC (rev 9620) +++ trunk/src/main/org/jboss/seam/web/IdentityFilter.java 2008-11-24 17:31:44 UTC (rev 9621) @@ -1,11 +1,13 @@ package org.jboss.seam.web; import java.io.IOException; + import javax.servlet.FilterChain; import javax.servlet.ServletException; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; + import org.jboss.seam.ScopeType; import org.jboss.seam.annotations.Install; import org.jboss.seam.annotations.Name; Modified: trunk/src/main/org/jboss/seam/web/IdentityRequestWrapper.java =================================================================== --- trunk/src/main/org/jboss/seam/web/IdentityRequestWrapper.java 2008-11-24 17:14:35 UTC (rev 9620) +++ trunk/src/main/org/jboss/seam/web/IdentityRequestWrapper.java 2008-11-24 17:31:44 UTC (rev 9621) @@ -1,8 +1,10 @@ package org.jboss.seam.web; import java.security.Principal; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequestWrapper; + import org.jboss.seam.Seam; import org.jboss.seam.security.Identity;