Author: anil.saldhana(a)jboss.com Date: 2009-10-27 17:56:43 -0400 (Tue, 27 Oct 2009) New Revision: 880 Modified: identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/servlets/MetadataServlet.java identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPRedirectValve.java identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPWebBrowserSSOValve.java identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/BaseFormAuthenticator.java identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPPostFormAuthenticator.java identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPRedirectFormAuthenticator.java identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/constants/GeneralConstants.java identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/filters/SPFilter.java identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/servlets/IDPServlet.java Log: refactor into constants Modified: identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/servlets/MetadataServlet.java =================================================================== --- identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/servlets/MetadataServlet.java 2009-10-27 21:40:24 UTC (rev 879) +++ identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/servlets/MetadataServlet.java 2009-10-27 21:56:43 UTC (rev 880) @@ -52,6 +52,7 @@ import org.jboss.identity.federation.saml.v2.metadata.EntityDescriptorType; import org.jboss.identity.federation.saml.v2.metadata.KeyDescriptorType; import org.jboss.identity.federation.saml.v2.metadata.RoleDescriptorType; +import org.jboss.identity.federation.web.constants.GeneralConstants; import org.jboss.identity.federation.web.util.ConfigurationUtil; import org.jboss.identity.xmlsec.w3.xmldsig.KeyInfoType; @@ -69,7 +70,7 @@ private static Logger log = Logger.getLogger(MetadataServlet.class); private boolean trace = log.isTraceEnabled(); - private String configFileLocation = "/WEB-INF/jboss-idfed.xml"; + private String configFileLocation = GeneralConstants.CONFIG_FILE_LOCATION; private transient MetadataProviderType metadataProviderType = null; private transient IMetadataProvider<?> metadataProvider = null; Modified: identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPRedirectValve.java =================================================================== --- identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPRedirectValve.java 2009-10-27 21:40:24 UTC (rev 879) +++ identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPRedirectValve.java 2009-10-27 21:56:43 UTC (rev 880) @@ -509,7 +509,7 @@ lifecycle.fireLifecycleEvent(START_EVENT, null); started = true; - String configFile = "/WEB-INF/jboss-idfed.xml"; + String configFile = GeneralConstants.CONFIG_FILE_LOCATION; Context context = (Context) getContainer(); InputStream is = context.getServletContext().getResourceAsStream(configFile); if(is == null) Modified: identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPWebBrowserSSOValve.java =================================================================== --- identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPWebBrowserSSOValve.java 2009-10-27 21:40:24 UTC (rev 879) +++ identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPWebBrowserSSOValve.java 2009-10-27 21:56:43 UTC (rev 880) @@ -776,7 +776,8 @@ //Get the chain from config chain = new DefaultSAML2HandlerChain(); - String configFile = "/WEB-INF/jboss-idfed.xml"; + String configFile = GeneralConstants.CONFIG_FILE_LOCATION; + context = (Context) getContainer(); InputStream is = context.getServletContext().getResourceAsStream(configFile); if(is == null) @@ -796,7 +797,8 @@ this.attribManager.setDelegate(delegate); } //Get the handlers - handlers = ConfigurationUtil.getHandlers(context.getServletContext().getResourceAsStream("/WEB-INF/jbid-handlers.xml")); + String handlerConfigFileName = GeneralConstants.HANDLER_CONFIG_FILE_LOCATION; + handlers = ConfigurationUtil.getHandlers(context.getServletContext().getResourceAsStream(handlerConfigFileName)); chain.addAll(HandlerUtil.getHandlers(handlers)); Map<String, Object> chainConfigOptions = new HashMap<String, Object>(); Modified: identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/BaseFormAuthenticator.java =================================================================== --- identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/BaseFormAuthenticator.java 2009-10-27 21:40:24 UTC (rev 879) +++ identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/BaseFormAuthenticator.java 2009-10-27 21:56:43 UTC (rev 880) @@ -60,7 +60,7 @@ protected String serviceURL = null; protected String identityURL = null; - protected String configFile = "/WEB-INF/jboss-idfed.xml"; + protected String configFile = GeneralConstants.CONFIG_FILE_LOCATION; protected transient SAML2HandlerChain chain = null; @@ -132,7 +132,8 @@ try { //Get the handlers - handlers = ConfigurationUtil.getHandlers(servletContext.getResourceAsStream("/WEB-INF/jbid-handlers.xml")); + String handlerConfigFileName = GeneralConstants.HANDLER_CONFIG_FILE_LOCATION; + handlers = ConfigurationUtil.getHandlers(servletContext.getResourceAsStream(handlerConfigFileName)); chain.addAll(HandlerUtil.getHandlers(handlers)); Map<String, Object> chainConfigOptions = new HashMap<String, Object>(); Modified: identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPPostFormAuthenticator.java =================================================================== --- identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPPostFormAuthenticator.java 2009-10-27 21:40:24 UTC (rev 879) +++ identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPPostFormAuthenticator.java 2009-10-27 21:56:43 UTC (rev 880) @@ -74,7 +74,7 @@ private boolean trace = log.isTraceEnabled(); private boolean jbossEnv = false; - private String logOutPage = "/logout.jsp"; + private String logOutPage = GeneralConstants.LOGOUT_PAGE_NAME; public SPPostFormAuthenticator() { Modified: identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPRedirectFormAuthenticator.java =================================================================== --- identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPRedirectFormAuthenticator.java 2009-10-27 21:40:24 UTC (rev 879) +++ identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPRedirectFormAuthenticator.java 2009-10-27 21:56:43 UTC (rev 880) @@ -82,7 +82,7 @@ private boolean jbossEnv = false; - private String logOutPage = "/logout.jsp"; + private String logOutPage = GeneralConstants.LOGOUT_PAGE_NAME; public SPRedirectFormAuthenticator() { Modified: identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/constants/GeneralConstants.java =================================================================== --- identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/constants/GeneralConstants.java 2009-10-27 21:40:24 UTC (rev 879) +++ identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/constants/GeneralConstants.java 2009-10-27 21:56:43 UTC (rev 880) @@ -35,15 +35,20 @@ String ATTIBUTE_MANAGER = "ATTRIBUTE_MANAGER"; String CONFIGURATION = "CONFIGURATION"; + String CONFIG_FILE_LOCATION = "/WEB-INF/jboss-idfed.xml"; String GLOBAL_LOGOUT = "GLO"; + + String HANDLER_CONFIG_FILE_LOCATION = "/WEB-INF/jbid-handlers.xml"; + String IDENTITY_SERVER = "IDENTITY_SERVER"; String IGNORE_SIGNATURES = "IGNORE_SIGNATURES"; String KEYPAIR = "KEYPAIR"; String LOGOUT_PAGE = "LOGOUT_PAGE"; + String LOGOUT_PAGE_NAME = "/logout.jsp"; String PRINCIPAL_ID = "jboss_identity.principal"; String RELAY_STATE = "RelayState"; Modified: identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/filters/SPFilter.java =================================================================== --- identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/filters/SPFilter.java 2009-10-27 21:40:24 UTC (rev 879) +++ identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/filters/SPFilter.java 2009-10-27 21:56:43 UTC (rev 880) @@ -120,7 +120,7 @@ private boolean trace = log.isTraceEnabled(); protected SPType spConfiguration = null; - protected String configFile = "/WEB-INF/jboss-idfed.xml"; + protected String configFile = GeneralConstants.CONFIG_FILE_LOCATION; protected String serviceURL = null; protected String identityURL = null; @@ -134,7 +134,7 @@ private IRoleValidator roleValidator = new DefaultRoleValidator(); - private String logOutPage = "/logout.jsp"; + private String logOutPage = GeneralConstants.LOGOUT_PAGE_NAME; public void destroy() { @@ -417,12 +417,9 @@ if(trace) log.trace("Server Exception:", e); throw new ServletException("Server Exception"); - } - - } - - } - + } + } + } } public void init(FilterConfig filterConfig) throws ServletException @@ -473,7 +470,8 @@ try { //Get the handlers - Handlers handlers = ConfigurationUtil.getHandlers(context.getResourceAsStream("/WEB-INF/jbid-handlers.xml")); + String handlerConfigFileName = GeneralConstants.HANDLER_CONFIG_FILE_LOCATION; + Handlers handlers = ConfigurationUtil.getHandlers(context.getResourceAsStream(handlerConfigFileName)); chain.addAll(HandlerUtil.getHandlers(handlers)); Map<String, Object> chainConfigOptions = new HashMap<String, Object>(); Modified: identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/servlets/IDPServlet.java =================================================================== --- identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/servlets/IDPServlet.java 2009-10-27 21:40:24 UTC (rev 879) +++ identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/servlets/IDPServlet.java 2009-10-27 21:56:43 UTC (rev 880) @@ -128,7 +128,8 @@ { Handlers handlers = null; super.init(config); - String configFile = "/WEB-INF/jboss-idfed.xml"; + String configFile = GeneralConstants.CONFIG_FILE_LOCATION; + context = config.getServletContext(); InputStream is = context.getResourceAsStream(configFile); @@ -155,7 +156,8 @@ } //Get the handlers - handlers = ConfigurationUtil.getHandlers(context.getResourceAsStream("/WEB-INF/jbid-handlers.xml")); + String handlerConfigFileName = GeneralConstants.HANDLER_CONFIG_FILE_LOCATION; + handlers = ConfigurationUtil.getHandlers(context.getResourceAsStream(handlerConfigFileName)); chain.addAll(HandlerUtil.getHandlers(handlers)); Map<String, Object> chainConfigOptions = new HashMap<String, Object>(); @@ -168,8 +170,7 @@ for(SAML2Handler handler: samlHandlers) { handler.initChainConfig(handlerChainConfig); - } - + } } catch (Exception e) {