JBoss Identity SVN: r332 - in identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat: sp and 1 other directory.
by jboss-identity-commits@lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2009-02-18 00:42:08 -0500 (Wed, 18 Feb 2009)
New Revision: 332
Modified:
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPRedirectValve.java
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPRedirectFormAuthenticator.java
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPUtil.java
Log:
JBID-52: fix the resource path to start with /WEB-INF
Modified: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPRedirectValve.java
===================================================================
--- identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPRedirectValve.java 2009-02-17 22:34:17 UTC (rev 331)
+++ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPRedirectValve.java 2009-02-18 05:42:08 UTC (rev 332)
@@ -406,7 +406,7 @@
lifecycle.fireLifecycleEvent(START_EVENT, null);
started = true;
- String configFile = "WEB-INF/jboss-idfed.xml";
+ String configFile = "/WEB-INF/jboss-idfed.xml";
Context context = (Context) getContainer();
InputStream is = context.getServletContext().getResourceAsStream(configFile);
if(is == null)
Modified: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPRedirectFormAuthenticator.java
===================================================================
--- identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPRedirectFormAuthenticator.java 2009-02-17 22:34:17 UTC (rev 331)
+++ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPRedirectFormAuthenticator.java 2009-02-18 05:42:08 UTC (rev 332)
@@ -80,8 +80,9 @@
@Override
public void start() throws LifecycleException
{
- String configFile = "WEB-INF/jboss-idfed.xml";
+ String configFile = "/WEB-INF/jboss-idfed.xml";
super.start();
+
InputStream is = context.getServletContext().getResourceAsStream(configFile);
if(is == null)
throw new RuntimeException(configFile + " missing");
Modified: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPUtil.java
===================================================================
--- identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPUtil.java 2009-02-17 22:34:17 UTC (rev 331)
+++ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPUtil.java 2009-02-18 05:42:08 UTC (rev 332)
@@ -128,7 +128,6 @@
return this.createGenericPrincipal(request, userName, roles);
}
-
private Principal createGenericPrincipal(Request request, String username, List<String> roles)
{
Context ctx = request.getContext();