Return-Path: X-Original-To: apmail-cxf-dev-archive@www.apache.org Delivered-To: apmail-cxf-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 16CC8F01A for ; Tue, 2 Apr 2013 20:49:39 +0000 (UTC) Received: (qmail 48366 invoked by uid 500); 2 Apr 2013 20:49:38 -0000 Delivered-To: apmail-cxf-dev-archive@cxf.apache.org Received: (qmail 48309 invoked by uid 500); 2 Apr 2013 20:49:38 -0000 Mailing-List: contact dev-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list dev@cxf.apache.org Received: (qmail 48293 invoked by uid 99); 2 Apr 2013 20:49:38 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Apr 2013 20:49:38 +0000 X-ASF-Spam-Status: No, hits=-0.0 required=5.0 tests=RCVD_IN_DNSWL_NONE,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: domain of owulff@talend.com designates 64.95.72.241 as permitted sender) Received: from [64.95.72.241] (HELO mxout.myoutlookonline.com) (64.95.72.241) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Apr 2013 20:49:33 +0000 Received: from mxout.myoutlookonline.com (localhost [127.0.0.1]) by mxout.myoutlookonline.com (Postfix) with ESMTP id 9FEDF7A6296; Tue, 2 Apr 2013 16:49:10 -0400 (EDT) X-Virus-Scanned: by SpamTitan at mail.lan Received: from S10HUB002.SH10.lan (unknown [10.110.2.1]) by mxout.myoutlookonline.com (Postfix) with ESMTP id C49237A613F; Tue, 2 Apr 2013 16:49:04 -0400 (EDT) Received: from S10BE002.SH10.lan ([::1]) by S10HUB002.SH10.lan ([::1]) with mapi id 14.01.0438.000; Tue, 2 Apr 2013 16:49:04 -0400 From: Oliver Wulff To: "dev@cxf.apache.org" , "coheigea@apache.org" Subject: RE: svn commit: r1462277 [1/2] - in /cxf/fediz/trunk: ./ examples/simpleWebapp/src/main/config/ examples/simpleWebapp/src/main/resources/ examples/springWebapp/src/main/config/ examples/wsclientWebapp/webapp/ examples/wsclientWebapp/webapp/src/main/con... Thread-Topic: svn commit: r1462277 [1/2] - in /cxf/fediz/trunk: ./ examples/simpleWebapp/src/main/config/ examples/simpleWebapp/src/main/resources/ examples/springWebapp/src/main/config/ examples/wsclientWebapp/webapp/ examples/wsclientWebapp/webapp/src/main/con... Thread-Index: AQHOL7I4Q8jJRnvYQUuzoR2cDEoThZjDZz+m Date: Tue, 2 Apr 2013 20:49:03 +0000 Message-ID: <79AB4452999C844D9920E0363533273111312256@S10BE002.SH10.lan> References: <20130328195339.BE5522388847@eris.apache.org>, In-Reply-To: Accept-Language: en-GB, de-DE, en-US Content-Language: en-GB X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [82.192.224.223] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Virus-Checked: Checked by ClamAV on apache.org Hi Colm=0A= =0A= Thanks for letting me know. Weird, I didn't get a notification.=0A= =0A= I've committed the fix.=0A= =0A= Thanks=0A= Oli=0A= =0A= =0A= ------=0A= =0A= Oliver Wulff=0A= =0A= Blog: http://owulff.blogspot.com=0A= Solution Architect=0A= http://coders.talend.com=0A= =0A= Talend Application Integration Division http://www.talend.com=0A= =0A= ________________________________________=0A= From: Colm O hEigeartaigh [coheigea@apache.org]=0A= Sent: 02 April 2013 16:52=0A= To: dev@cxf.apache.org=0A= Subject: Re: svn commit: r1462277 [1/2] - in /cxf/fediz/trunk: ./ examples/= simpleWebapp/src/main/config/ examples/simpleWebapp/src/main/resources/ exa= mples/springWebapp/src/main/config/ examples/wsclientWebapp/webapp/ example= s/wsclientWebapp/webapp/src/main/con...=0A= =0A= Hi Oli,=0A= =0A= This merge caused some of the systests to fail...=0A= =0A= Colm.=0A= =0A= =0A= On Thu, Mar 28, 2013 at 7:53 PM, wrote:=0A= =0A= > Author: owulff=0A= > Date: Thu Mar 28 19:53:35 2013=0A= > New Revision: 1462277=0A= >=0A= > URL: http://svn.apache.org/r1462277=0A= > Log:=0A= > Merge branch 'springidp' into trunk=0A= >=0A= > Added:=0A= >=0A= > cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/i= dp/UsernamePasswordCredentials.java=0A= >=0A= > cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/i= dp/beans/=0A= >=0A= > cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/i= dp/beans/DecodeAuthorizationHeaderAction.java=0A= >=0A= > cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/i= dp/beans/InitialFlowSetupAction.java=0A= >=0A= > cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/i= dp/beans/LogoutAction.java=0A= >=0A= > cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/i= dp/beans/STSClientAction.java=0A= >=0A= > cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/i= dp/beans/WfreshParser.java=0A= >=0A= > cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/i= dp/util/=0A= >=0A= > cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/i= dp/util/WebUtils.java=0A= >=0A= > cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/federation-webflow.x= ml=0A= > cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/genericerror.jsp= =0A= > cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/idp-servlet.xml= =0A= >=0A= > cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/signinresponseform.j= sp=0A= >=0A= > cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/signoutresponse.jsp= =0A= > cxf/fediz/trunk/systests/jetty8/src/test/webapps/=0A= > cxf/fediz/trunk/systests/jetty8/src/test/webapps/fediz-idp/=0A= > cxf/fediz/trunk/systests/jetty8/src/test/webapps/fediz-idp/WEB-INF/= =0A= >=0A= > cxf/fediz/trunk/systests/jetty8/src/test/webapps/fediz-idp/WEB-INF/idp-se= rvlet.xml=0A= > cxf/fediz/trunk/systests/tomcat7/src/test/webapps/=0A= > cxf/fediz/trunk/systests/tomcat7/src/test/webapps/fediz-idp/=0A= > cxf/fediz/trunk/systests/tomcat7/src/test/webapps/fediz-idp/WEB-INF/= =0A= >=0A= > cxf/fediz/trunk/systests/tomcat7/src/test/webapps/fediz-idp/WEB-INF/idp-s= ervlet.xml=0A= > Modified:=0A= > cxf/fediz/trunk/.gitignore=0A= > cxf/fediz/trunk/examples/simpleWebapp/src/main/config/fediz_config.xm= l=0A= >=0A= > cxf/fediz/trunk/examples/simpleWebapp/src/main/resources/log4j.properties= =0A= >=0A= > cxf/fediz/trunk/examples/simpleWebapp/src/main/resources/logging.properti= es=0A= > cxf/fediz/trunk/examples/springWebapp/src/main/config/fediz_config.xm= l=0A= > cxf/fediz/trunk/examples/wsclientWebapp/webapp/pom.xml=0A= >=0A= > cxf/fediz/trunk/examples/wsclientWebapp/webapp/src/main/config/fediz_conf= ig.xml=0A= >=0A= > cxf/fediz/trunk/examples/wsclientWebapp/webapp/src/main/resources/logging= .properties=0A= >=0A= > cxf/fediz/trunk/examples/wsclientWebapp/webapp/src/main/webapp/WEB-INF/we= b.xml=0A= > cxf/fediz/trunk/pom.xml=0A= > cxf/fediz/trunk/services/idp/pom.xml=0A= > cxf/fediz/trunk/services/idp/src/main/resources/log4j.properties=0A= > cxf/fediz/trunk/services/idp/src/main/resources/logging.properties=0A= >=0A= > cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/applicationContext.x= ml=0A= > cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/signinform.jsp= =0A= > cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/web.xml=0A= > cxf/fediz/trunk/services/sts/pom.xml=0A= > cxf/fediz/trunk/services/sts/src/main/resources/log4j.properties=0A= > cxf/fediz/trunk/services/sts/src/main/resources/logging.properties=0A= > cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/cxf-transport.xm= l=0A= > cxf/fediz/trunk/systests/jetty8/pom.xml=0A= >=0A= > cxf/fediz/trunk/systests/jetty8/src/test/java/org/apache/cxf/fediz/integr= ationtests/JettyPreAuthSpringTest.java=0A= >=0A= > cxf/fediz/trunk/systests/jetty8/src/test/java/org/apache/cxf/fediz/integr= ationtests/JettyTest.java=0A= >=0A= > cxf/fediz/trunk/systests/jetty8/src/test/java/org/apache/cxf/fediz/integr= ationtests/JettyUtils.java=0A= > cxf/fediz/trunk/systests/jetty8/src/test/resources/fediz_config.xml= =0A= > cxf/fediz/trunk/systests/jetty8/src/test/resources/idp-server.xml=0A= > cxf/fediz/trunk/systests/jetty8/src/test/resources/rp-server.xml=0A= > cxf/fediz/trunk/systests/spring/src/test/resources/fediz_config.xml= =0A= > cxf/fediz/trunk/systests/spring/src/test/resources/idp-server.xml=0A= >=0A= > cxf/fediz/trunk/systests/tests/src/test/java/org/apache/cxf/fediz/integra= tiontests/AbstractTests.java=0A= > cxf/fediz/trunk/systests/tomcat7/pom.xml=0A= >=0A= > cxf/fediz/trunk/systests/tomcat7/src/test/java/org/apache/cxf/fediz/integ= rationtests/TomcatTest.java=0A= > cxf/fediz/trunk/systests/tomcat7/src/test/resources/fediz_config.xml= =0A= >=0A= > Modified: cxf/fediz/trunk/.gitignore=0A= > URL:=0A= > http://svn.apache.org/viewvc/cxf/fediz/trunk/.gitignore?rev=3D1462277&r1= =3D1462276&r2=3D1462277&view=3Ddiff=0A= >=0A= > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=0A= > --- cxf/fediz/trunk/.gitignore (original)=0A= > +++ cxf/fediz/trunk/.gitignore Thu Mar 28 19:53:35 2013=0A= > @@ -8,6 +8,8 @@=0A= > .project=0A= > .ruleset=0A= > .settings/=0A= > +.svn/=0A= > target/=0A= > velocity.log=0A= > +.externalToolBuilders/=0A= >=0A= >=0A= > Modified:=0A= > cxf/fediz/trunk/examples/simpleWebapp/src/main/config/fediz_config.xml=0A= > URL:=0A= > http://svn.apache.org/viewvc/cxf/fediz/trunk/examples/simpleWebapp/src/ma= in/config/fediz_config.xml?rev=3D1462277&r1=3D1462276&r2=3D1462277&view=3Dd= iff=0A= >=0A= > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=0A= > --- cxf/fediz/trunk/examples/simpleWebapp/src/main/config/fediz_config.xm= l=0A= > (original)=0A= > +++ cxf/fediz/trunk/examples/simpleWebapp/src/main/config/fediz_config.xm= l=0A= > Thu Mar 28 19:53:35 2013=0A= > @@ -21,11 +21,11 @@=0A= > http://www.w3.org/2001/XMLSchema-instance"=0A= > xsi:type=3D"federationProtocolType" version=3D"1.= 0.0">=0A= >=0A= > urn:org:apache:cxf:fediz:fedizhelloworld=0A= > - https://localhost:9443/fediz-idp/=0A= > + =0A= > https://localhost:9443/fediz-idp/federation=0A= > ,=0A= > =0A= > http://schemas.xmlsoap.org/ws/2005/05/identity/claims/role=0A= > =0A= > - =0A= > + type=3D"Class">org.apache.cxf.fediz.example.HomeRealmCallbackHandler=0A= > =0A= > =0A= > =0A= >=0A= > Modified:=0A= > cxf/fediz/trunk/examples/simpleWebapp/src/main/resources/log4j.properties= =0A= > URL:=0A= > http://svn.apache.org/viewvc/cxf/fediz/trunk/examples/simpleWebapp/src/ma= in/resources/log4j.properties?rev=3D1462277&r1=3D1462276&r2=3D1462277&view= =3Ddiff=0A= >=0A= > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=0A= > ---=0A= > cxf/fediz/trunk/examples/simpleWebapp/src/main/resources/log4j.properties= =0A= > (original)=0A= > +++=0A= > cxf/fediz/trunk/examples/simpleWebapp/src/main/resources/log4j.properties= =0A= > Thu Mar 28 19:53:35 2013=0A= > @@ -1,6 +1,6 @@=0A= > # Set root category priority to INFO and its only appender to CONSOLE.= =0A= > -log4j.rootCategory=3DFATAL, CONSOLE=0A= > -#log4j.rootCategory=3DDEBUG, CONSOLE=0A= > +#log4j.rootCategory=3DFATAL, CONSOLE=0A= > +log4j.rootCategory=3DDEBUG, CONSOLE=0A= >=0A= > # CONSOLE is set to be a ConsoleAppender using a PatternLayout.=0A= > log4j.appender.CONSOLE=3Dorg.apache.log4j.ConsoleAppender=0A= >=0A= > Modified:=0A= > cxf/fediz/trunk/examples/simpleWebapp/src/main/resources/logging.properti= es=0A= > URL:=0A= > http://svn.apache.org/viewvc/cxf/fediz/trunk/examples/simpleWebapp/src/ma= in/resources/logging.properties?rev=3D1462277&r1=3D1462276&r2=3D1462277&vie= w=3Ddiff=0A= >=0A= > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=0A= > ---=0A= > cxf/fediz/trunk/examples/simpleWebapp/src/main/resources/logging.properti= es=0A= > (original)=0A= > +++=0A= > cxf/fediz/trunk/examples/simpleWebapp/src/main/resources/logging.properti= es=0A= > Thu Mar 28 19:53:35 2013=0A= > @@ -38,9 +38,9 @@ java.util.logging.FileHandler.count =3D 1=0A= > java.util.logging.FileHandler.formatter =3D java.util.logging.XMLFormatt= er=0A= >=0A= > # Limit the message that are printed on the console to WARNING and above= .=0A= > -java.util.logging.ConsoleHandler.level =3D INFO=0A= > +java.util.logging.ConsoleHandler.level =3D FINEST=0A= > java.util.logging.ConsoleHandler.formatter =3D=0A= > java.util.logging.SimpleFormatter=0A= > -=0A= > +java.util.logging.SimpleFormatter.format=3D"HEL %1$tc %2$s%n%4$s:=0A= > %5$s%6$s%n"=0A= >=0A= > ############################################################=0A= > # Facility specific properties.=0A= > @@ -50,3 +50,4 @@ java.util.logging.ConsoleHandler.formatt=0A= > # For example, set the com.xyz.foo logger to only log SEVERE=0A= > # messages:=0A= > #com.xyz.foo.level =3D SEVERE=0A= > +org.apache.cxf.fediz.level =3D FINE=0A= > \ No newline at end of file=0A= >=0A= > Modified:=0A= > cxf/fediz/trunk/examples/springWebapp/src/main/config/fediz_config.xml=0A= > URL:=0A= > http://svn.apache.org/viewvc/cxf/fediz/trunk/examples/springWebapp/src/ma= in/config/fediz_config.xml?rev=3D1462277&r1=3D1462276&r2=3D1462277&view=3Dd= iff=0A= >=0A= > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=0A= > --- cxf/fediz/trunk/examples/springWebapp/src/main/config/fediz_config.xm= l=0A= > (original)=0A= > +++ cxf/fediz/trunk/examples/springWebapp/src/main/config/fediz_config.xm= l=0A= > Thu Mar 28 19:53:35 2013=0A= > @@ -21,11 +21,11 @@=0A= > http://www.w3.org/2001/XMLSchema-instance"=0A= > xsi:type=3D"federationProtocolType" version=3D"1.= 0.0">=0A= >=0A= > urn:org:apache:cxf:fediz:fedizhelloworld=0A= > - https://localhost:9443/fediz-idp/=0A= > + =0A= > https://localhost:9443/fediz-idp/federation=0A= > ,=0A= > =0A= > http://schemas.xmlsoap.org/ws/2005/05/identity/claims/role=0A= > =0A= > - =0A= > + type=3D"Class">org.apache.cxf.fediz.example.HomeRealmCallbackHandler=0A= > =0A= > =0A= > =0A= >=0A= > Modified: cxf/fediz/trunk/examples/wsclientWebapp/webapp/pom.xml=0A= > URL:=0A= > http://svn.apache.org/viewvc/cxf/fediz/trunk/examples/wsclientWebapp/weba= pp/pom.xml?rev=3D1462277&r1=3D1462276&r2=3D1462277&view=3Ddiff=0A= >=0A= > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=0A= > --- cxf/fediz/trunk/examples/wsclientWebapp/webapp/pom.xml (original)=0A= > +++ cxf/fediz/trunk/examples/wsclientWebapp/webapp/pom.xml Thu Mar 28=0A= > 19:53:35 2013=0A= > @@ -121,7 +121,7 @@=0A= > org.slf4j=0A= > slf4j-api=0A= > ${slf4j.version}=0A= > - compile=0A= > + provided=0A= > =0A= > =0A= >=0A= >=0A= > Modified:=0A= > cxf/fediz/trunk/examples/wsclientWebapp/webapp/src/main/config/fediz_conf= ig.xml=0A= > URL:=0A= > http://svn.apache.org/viewvc/cxf/fediz/trunk/examples/wsclientWebapp/weba= pp/src/main/config/fediz_config.xml?rev=3D1462277&r1=3D1462276&r2=3D1462277= &view=3Ddiff=0A= >=0A= > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=0A= > ---=0A= > cxf/fediz/trunk/examples/wsclientWebapp/webapp/src/main/config/fediz_conf= ig.xml=0A= > (original)=0A= > +++=0A= > cxf/fediz/trunk/examples/wsclientWebapp/webapp/src/main/config/fediz_conf= ig.xml=0A= > Thu Mar 28 19:53:35 2013=0A= > @@ -21,11 +21,11 @@=0A= > http://www.w3.org/2001/XMLSchema-instance"=0A= > xsi:type=3D"federationProtocolType" version=3D"1.= 0.0">=0A= >=0A= > urn:org:apache:cxf:fediz:fedizhelloworld=0A= > - https://localhost:9443/fediz-idp/=0A= > + =0A= > https://localhost:9443/fediz-idp/federation=0A= > ,=0A= > =0A= > http://schemas.xmlsoap.org/ws/2005/05/identity/claims/role=0A= > =0A= > - =0A= > + type=3D"Class">org.apache.cxf.fediz.example.HomeRealmCallbackHandler=0A= > =0A= > =0A= > =0A= >=0A= > Modified:=0A= > cxf/fediz/trunk/examples/wsclientWebapp/webapp/src/main/resources/logging= .properties=0A= > URL:=0A= > http://svn.apache.org/viewvc/cxf/fediz/trunk/examples/wsclientWebapp/weba= pp/src/main/resources/logging.properties?rev=3D1462277&r1=3D1462276&r2=3D14= 62277&view=3Ddiff=0A= >=0A= > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=0A= > ---=0A= > cxf/fediz/trunk/examples/wsclientWebapp/webapp/src/main/resources/logging= .properties=0A= > (original)=0A= > +++=0A= > cxf/fediz/trunk/examples/wsclientWebapp/webapp/src/main/resources/logging= .properties=0A= > Thu Mar 28 19:53:35 2013=0A= > @@ -38,9 +38,9 @@ java.util.logging.FileHandler.count =3D 1=0A= > java.util.logging.FileHandler.formatter =3D java.util.logging.XMLFormatt= er=0A= >=0A= > # Limit the message that are printed on the console to WARNING and above= .=0A= > -java.util.logging.ConsoleHandler.level =3D INFO=0A= > +java.util.logging.ConsoleHandler.level =3D FINEST=0A= > java.util.logging.ConsoleHandler.formatter =3D=0A= > java.util.logging.SimpleFormatter=0A= > -=0A= > +java.util.logging.SimpleFormatter.format=3D"HEL %1$tc %2$s%n%4$s:=0A= > %5$s%6$s%n"=0A= >=0A= > ############################################################=0A= > # Facility specific properties.=0A= > @@ -50,3 +50,4 @@ java.util.logging.ConsoleHandler.formatt=0A= > # For example, set the com.xyz.foo logger to only log SEVERE=0A= > # messages:=0A= > #com.xyz.foo.level =3D SEVERE=0A= > +org.apache.cxf.fediz.level =3D FINE=0A= > \ No newline at end of file=0A= >=0A= > Modified:=0A= > cxf/fediz/trunk/examples/wsclientWebapp/webapp/src/main/webapp/WEB-INF/we= b.xml=0A= > URL:=0A= > http://svn.apache.org/viewvc/cxf/fediz/trunk/examples/wsclientWebapp/weba= pp/src/main/webapp/WEB-INF/web.xml?rev=3D1462277&r1=3D1462276&r2=3D1462277&= view=3Ddiff=0A= >=0A= > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=0A= > ---=0A= > cxf/fediz/trunk/examples/wsclientWebapp/webapp/src/main/webapp/WEB-INF/we= b.xml=0A= > (original)=0A= > +++=0A= > cxf/fediz/trunk/examples/wsclientWebapp/webapp/src/main/webapp/WEB-INF/we= b.xml=0A= > Thu Mar 28 19:53:35 2013=0A= > @@ -1,67 +1,67 @@=0A= > - http://www.w3.org/2001/XMLSchema-instance"=0A= > - xsi:schemaLocation=3D"http://java.sun.com/xml/ns/javaee=0A= > - http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"= =0A= > - version=3D"3.0" metadata-complete=3D"true">=0A= > -=0A= > - WS Federation WS-Client Web Application=0A= > Example=0A= > - WS Federation WS-Client Web Application=0A= > Example=0A= > -=0A= > - =0A= > - contextConfigLocation=0A= > - WEB-INF/applicationContext.xml=0A= > - =0A= > - =0A= > -=0A= > org.springframework.web.context.ContextLoaderListener=0A= > - =0A= > -=0A= > - = =0A= > - =0A= > - FederationFilter=0A= > -=0A= > org.apache.cxf.fediz.cxf.web.FederationFilter=0A= > - =0A= > -=0A= > - =0A= > - =0A= > - FederationFilter=0A= > - /secure/*=0A= > - =0A= > -=0A= > - =0A= > - FederationServlet=0A= > -=0A= > org.apache.cxf.fediz.example.FederationServlet=0A= > - =0A= > -=0A= > - =0A= > - FederationServlet=0A= > - /secure/fedservlet=0A= > - =0A= > -=0A= > - =0A= > - Manager=0A= > - =0A= > - =0A= > - User=0A= > - =0A= > - =0A= > - Admin=0A= > - =0A= > - =0A= > - Authenticated=0A= > - =0A= > -=0A= > - =0A= > - =0A= > - Protected=0A= > Area=0A= > - /secure/*=0A= > - =0A= > - =0A= > - *=0A= > - =0A= > - =0A= > -=0A= > - =0A= > - WSFED=0A= > - WSFED=0A= > - =0A= > -=0A= > -=0A= > + http://www.w3.org/2001/XMLSchema-instance"=0A= > + xsi:schemaLocation=3D"http://java.sun.com/xml/ns/javaee=0A= > + http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"= =0A= > + version=3D"3.0" metadata-complete=3D"true">=0A= > +=0A= > + WS Federation WS-Client Web Application=0A= > Example=0A= > + WS Federation WS-Client Web Application=0A= > Example=0A= > +=0A= > + =0A= > + contextConfigLocation=0A= > + WEB-INF/applicationContext.xml=0A= > + =0A= > + =0A= > +=0A= > org.springframework.web.context.ContextLoaderListener=0A= > + =0A= > +=0A= > + = =0A= > + =0A= > + FederationFilter=0A= > +=0A= > org.apache.cxf.fediz.cxf.web.FederationFilter=0A= > + =0A= > +=0A= > + =0A= > + =0A= > + FederationFilter=0A= > + /secure/*=0A= > + =0A= > +=0A= > + =0A= > + FederationServlet=0A= > +=0A= > org.apache.cxf.fediz.example.FederationServlet=0A= > + =0A= > +=0A= > + =0A= > + FederationServlet=0A= > + /secure/fedservlet=0A= > + =0A= > +=0A= > + =0A= > + Manager=0A= > + =0A= > + =0A= > + User=0A= > + =0A= > + =0A= > + Admin=0A= > + =0A= > + =0A= > + Authenticated=0A= > + =0A= > +=0A= > + =0A= > + =0A= > + Protected=0A= > Area=0A= > + /secure/*=0A= > + =0A= > + =0A= > + *=0A= > + =0A= > + =0A= > +=0A= > + =0A= > + WSFED=0A= > + WSFED=0A= > + =0A= > +=0A= > +=0A= >=0A= > Modified: cxf/fediz/trunk/pom.xml=0A= > URL:=0A= > http://svn.apache.org/viewvc/cxf/fediz/trunk/pom.xml?rev=3D1462277&r1=3D1= 462276&r2=3D1462277&view=3Ddiff=0A= >=0A= > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=0A= > --- cxf/fediz/trunk/pom.xml (original)=0A= > +++ cxf/fediz/trunk/pom.xml Thu Mar 28 19:53:35 2013=0A= > @@ -622,7 +622,7 @@=0A= > =0A= > setup.eclipse=0A= > =0A= > -=0A= > ${basedir}/../workspace= =0A= > +=0A= > ${basedir}/../workspace/fediz-wf=0A= > =0A= > =0A= > process-test-sources=0A= >=0A= > Modified: cxf/fediz/trunk/services/idp/pom.xml=0A= > URL:=0A= > http://svn.apache.org/viewvc/cxf/fediz/trunk/services/idp/pom.xml?rev=3D1= 462277&r1=3D1462276&r2=3D1462277&view=3Ddiff=0A= >=0A= > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=0A= > --- cxf/fediz/trunk/services/idp/pom.xml (original)=0A= > +++ cxf/fediz/trunk/services/idp/pom.xml Thu Mar 28 19:53:35 2013=0A= > @@ -26,7 +26,7 @@=0A= > ../../pom.xml=0A= > =0A= > fediz-idp=0A= > - Apache Fediz IDP=0A= > + Apache Fediz IDP (Spring Web Flow)=0A= > war=0A= > =0A= > =0A= > @@ -39,24 +39,41 @@=0A= > =0A= > javax.servlet=0A= > servlet-api=0A= > - ${servlet.version}=0A= > + 2.5=0A= > provided=0A= > =0A= > +=0A= > +=0A= > +=0A= > +=0A= > +=0A= > =0A= > org.springframework=0A= > - spring-web=0A= > + spring-webmvc=0A= > ${spring.version}=0A= > =0A= > =0A= > - org.slf4j=0A= > - slf4j-api=0A= > - ${slf4j.version}=0A= > + org.springframework.webflow=0A= > + spring-webflow=0A= > + 2.3.1.RELEASE=0A= > + =0A= > + =0A= > + ognl=0A= > + ognl=0A= > + 3.0.5=0A= > + runtime=0A= > =0A= > =0A= > org.slf4j=0A= > - slf4j-jdk14=0A= > + slf4j-api=0A= > ${slf4j.version}=0A= > + provided=0A= > =0A= > +=0A= > +=0A= > +=0A= > +=0A= > +=0A= > =0A= > org.apache.cxf=0A= > cxf-rt-ws-security=0A= > @@ -75,7 +92,7 @@=0A= > =0A= > org.apache.commons=0A= > commons-lang3=0A= > - ${commons.lang.version}=0A= > + 3.0.1=0A= > =0A= > =0A= > =0A= >=0A= > Added:=0A= > cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/i= dp/UsernamePasswordCredentials.java=0A= > URL:=0A= > http://svn.apache.org/viewvc/cxf/fediz/trunk/services/idp/src/main/java/o= rg/apache/cxf/fediz/service/idp/UsernamePasswordCredentials.java?rev=3D1462= 277&view=3Dauto=0A= >=0A= > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=0A= > ---=0A= > cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/i= dp/UsernamePasswordCredentials.java=0A= > (added)=0A= > +++=0A= > cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/i= dp/UsernamePasswordCredentials.java=0A= > Thu Mar 28 19:53:35 2013=0A= > @@ -0,0 +1,46 @@=0A= > +/**=0A= > + * Licensed to the Apache Software Foundation (ASF) under one=0A= > + * or more contributor license agreements. See the NOTICE file=0A= > + * distributed with this work for additional information=0A= > + * regarding copyright ownership. The ASF licenses this file=0A= > + * to you under the Apache License, Version 2.0 (the=0A= > + * "License"); you may not use this file except in compliance=0A= > + * with the License. You may obtain a copy of the License at=0A= > + *=0A= > + * http://www.apache.org/licenses/LICENSE-2.0=0A= > + *=0A= > + * Unless required by applicable law or agreed to in writing,=0A= > + * software distributed under the License is distributed on an=0A= > + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY=0A= > + * KIND, either express or implied. See the License for the=0A= > + * specific language governing permissions and limitations=0A= > + * under the License.=0A= > + */=0A= > +package org.apache.cxf.fediz.service.idp;=0A= > +=0A= > +import java.io.Serializable;=0A= > +=0A= > +public class UsernamePasswordCredentials implements Serializable {=0A= > +=0A= > + private static final long serialVersionUID =3D 1L;=0A= > +=0A= > + private String username;=0A= > + private String password;=0A= > +=0A= > + public String getUsername() {=0A= > + return username;=0A= > + }=0A= > +=0A= > + public void setUsername(String username) {=0A= > + this.username =3D username;=0A= > + }=0A= > +=0A= > + public String getPassword() {=0A= > + return password;=0A= > + }=0A= > +=0A= > + public void setPassword(String password) {=0A= > + this.password =3D password;=0A= > + }=0A= > +=0A= > +}=0A= >=0A= > Added:=0A= > cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/i= dp/beans/DecodeAuthorizationHeaderAction.java=0A= > URL:=0A= > http://svn.apache.org/viewvc/cxf/fediz/trunk/services/idp/src/main/java/o= rg/apache/cxf/fediz/service/idp/beans/DecodeAuthorizationHeaderAction.java?= rev=3D1462277&view=3Dauto=0A= >=0A= > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=0A= > ---=0A= > cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/i= dp/beans/DecodeAuthorizationHeaderAction.java=0A= > (added)=0A= > +++=0A= > cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/i= dp/beans/DecodeAuthorizationHeaderAction.java=0A= > Thu Mar 28 19:53:35 2013=0A= > @@ -0,0 +1,64 @@=0A= > +/**=0A= > + * Licensed to the Apache Software Foundation (ASF) under one=0A= > + * or more contributor license agreements. See the NOTICE file=0A= > + * distributed with this work for additional information=0A= > + * regarding copyright ownership. The ASF licenses this file=0A= > + * to you under the Apache License, Version 2.0 (the=0A= > + * "License"); you may not use this file except in compliance=0A= > + * with the License. You may obtain a copy of the License at=0A= > + *=0A= > + * http://www.apache.org/licenses/LICENSE-2.0=0A= > + *=0A= > + * Unless required by applicable law or agreed to in writing,=0A= > + * software distributed under the License is distributed on an=0A= > + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY=0A= > + * KIND, either express or implied. See the License for the=0A= > + * specific language governing permissions and limitations=0A= > + * under the License.=0A= > + */=0A= > +package org.apache.cxf.fediz.service.idp.beans;=0A= > +=0A= > +import java.util.StringTokenizer;=0A= > +=0A= > +import org.apache.cxf.common.util.Base64Utility;=0A= > +import org.apache.cxf.fediz.service.idp.UsernamePasswordCredentials;=0A= > +import org.apache.cxf.fediz.service.idp.util.WebUtils;=0A= > +import org.springframework.webflow.execution.RequestContext;=0A= > +=0A= > +/**=0A= > + * @author fr17993 This class is responsible to decode authorization=0A= > header with=0A= > + * basic authentication.=0A= > + */=0A= > +=0A= > +public class DecodeAuthorizationHeaderAction {=0A= > +=0A= > + public UsernamePasswordCredentials submit(RequestContext=0A= > requestContext)=0A= > + throws Exception {=0A= > + String authorizationHeader =3D WebUtils.getHttpServletRequest(= =0A= > + requestContext).getHeader("Authorization");=0A= > + String username =3D null;=0A= > + String password =3D null;=0A= > +=0A= > + StringTokenizer st =3D new StringTokenizer(authorizationHeader, = "=0A= > ");=0A= > + String authType =3D st.nextToken();=0A= > + String encoded =3D st.nextToken();=0A= > +=0A= > + if (!authType.equalsIgnoreCase("basic")) {=0A= > + throw new Exception("Invalid Authorization header");=0A= > + }=0A= > +=0A= > + String decoded =3D new String(Base64Utility.decode(encoded));=0A= > +=0A= > + int colon =3D decoded.indexOf(':');=0A= > + if (colon < 0) {=0A= > + username =3D decoded;=0A= > + } else {=0A= > + username =3D decoded.substring(0, colon);=0A= > + password =3D decoded.substring(colon + 1, decoded.length());= =0A= > + }=0A= > + UsernamePasswordCredentials usernamePasswordCredentials =3D new= =0A= > UsernamePasswordCredentials();=0A= > + usernamePasswordCredentials.setUsername(username);=0A= > + usernamePasswordCredentials.setPassword(password);=0A= > + return usernamePasswordCredentials;=0A= > + }=0A= > +}=0A= >=0A= > Added:=0A= > cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/i= dp/beans/InitialFlowSetupAction.java=0A= > URL:=0A= > http://svn.apache.org/viewvc/cxf/fediz/trunk/services/idp/src/main/java/o= rg/apache/cxf/fediz/service/idp/beans/InitialFlowSetupAction.java?rev=3D146= 2277&view=3Dauto=0A= >=0A= > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=0A= > ---=0A= > cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/i= dp/beans/InitialFlowSetupAction.java=0A= > (added)=0A= > +++=0A= > cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/i= dp/beans/InitialFlowSetupAction.java=0A= > Thu Mar 28 19:53:35 2013=0A= > @@ -0,0 +1,91 @@=0A= > +/**=0A= > + * Licensed to the Apache Software Foundation (ASF) under one=0A= > + * or more contributor license agreements. See the NOTICE file=0A= > + * distributed with this work for additional information=0A= > + * regarding copyright ownership. The ASF licenses this file=0A= > + * to you under the Apache License, Version 2.0 (the=0A= > + * "License"); you may not use this file except in compliance=0A= > + * with the License. You may obtain a copy of the License at=0A= > + *=0A= > + * http://www.apache.org/licenses/LICENSE-2.0=0A= > + *=0A= > + * Unless required by applicable law or agreed to in writing,=0A= > + * software distributed under the License is distributed on an=0A= > + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY=0A= > + * KIND, either express or implied. See the License for the=0A= > + * specific language governing permissions and limitations=0A= > + * under the License.=0A= > + */=0A= > +package org.apache.cxf.fediz.service.idp.beans;=0A= > +=0A= > +import org.apache.cxf.fediz.service.idp.util.WebUtils;=0A= > +import org.slf4j.Logger;=0A= > +import org.slf4j.LoggerFactory;=0A= > +import org.springframework.webflow.execution.RequestContext;=0A= > +=0A= > +/**=0A= > + * @author fr17993 This class is responsible to initialize web flow.=0A= > + */=0A= > +=0A= > +public class InitialFlowSetupAction {=0A= > +=0A= > + private static final String AUTH_SUPPORT_TYPE =3D "idp.authSupportTy= pe";=0A= > +=0A= > + private static final String IDP_NAME =3D "idpName";=0A= > +=0A= > + private static final Logger LOG =3D LoggerFactory=0A= > + .getLogger(InitialFlowSetupAction.class);=0A= > +=0A= > + private String idpName =3D "IDP";=0A= > +=0A= > + private String authSupportType;=0A= > +=0A= > + public String getIdpName() {=0A= > + return idpName;=0A= > + }=0A= > +=0A= > + public void setIdpName(String idpName) {=0A= > + this.idpName =3D idpName;=0A= > + }=0A= > +=0A= > + public String getAuthSupportType() {=0A= > + return authSupportType;=0A= > + }=0A= > +=0A= > + public void setAuthSupportType(String authSupportType) {=0A= > + this.authSupportType =3D authSupportType;=0A= > + }=0A= > +=0A= > + private static enum SupportType {=0A= > + FORM, BASIC;=0A= > + }=0A= > +=0A= > + /**=0A= > + * @throws IllegalArgumentException=0A= > + */=0A= > + public void submit(RequestContext context) {=0A= > + if (System.getProperty(AUTH_SUPPORT_TYPE) !=3D null) {=0A= > + authSupportType =3D System.getProperty(AUTH_SUPPORT_TYPE);= =0A= > + LOG.info("Bean property [authSupportType] has been overriden= =0A= > from system properties");=0A= > + }=0A= > + if (SupportType.valueOf(authSupportType) !=3D null) {=0A= > + WebUtils.putAttributeInFlowScope(context, AUTH_SUPPORT_TYPE,= =0A= > + authSupportType);=0A= > + LOG.info(AUTH_SUPPORT_TYPE + "=3D" + authSupportType=0A= > + + " has been stored in flow scope");=0A= > + } else {=0A= > + throw new IllegalArgumentException(AUTH_SUPPORT_TYPE + "=3D"= =0A= > + + authSupportType + " not supported");=0A= > + }=0A= > + putAttributeInFlowScope(context, IDP_NAME, idpName);=0A= > + }=0A= > +=0A= > + private void putAttributeInFlowScope(RequestContext context, String= =0A= > key, String value) {=0A= > + if (value !=3D null) {=0A= > + WebUtils.putAttributeInFlowScope(context, key, value);=0A= > + LOG.info(key + "=3D" + value + " has been stored in flow=0A= > scope");=0A= > + } else {=0A= > + throw new IllegalArgumentException("Bean property [" + key += =0A= > "] should be configured");=0A= > + }=0A= > + }=0A= > +}=0A= >=0A= > Added:=0A= > cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/i= dp/beans/LogoutAction.java=0A= > URL:=0A= > http://svn.apache.org/viewvc/cxf/fediz/trunk/services/idp/src/main/java/o= rg/apache/cxf/fediz/service/idp/beans/LogoutAction.java?rev=3D1462277&view= =3Dauto=0A= >=0A= > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=0A= > ---=0A= > cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/i= dp/beans/LogoutAction.java=0A= > (added)=0A= > +++=0A= > cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/i= dp/beans/LogoutAction.java=0A= > Thu Mar 28 19:53:35 2013=0A= > @@ -0,0 +1,33 @@=0A= > +/**=0A= > + * Licensed to the Apache Software Foundation (ASF) under one=0A= > + * or more contributor license agreements. See the NOTICE file=0A= > + * distributed with this work for additional information=0A= > + * regarding copyright ownership. The ASF licenses this file=0A= > + * to you under the Apache License, Version 2.0 (the=0A= > + * "License"); you may not use this file except in compliance=0A= > + * with the License. You may obtain a copy of the License at=0A= > + *=0A= > + * http://www.apache.org/licenses/LICENSE-2.0=0A= > + *=0A= > + * Unless required by applicable law or agreed to in writing,=0A= > + * software distributed under the License is distributed on an=0A= > + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY=0A= > + * KIND, either express or implied. See the License for the=0A= > + * specific language governing permissions and limitations=0A= > + * under the License.=0A= > + */=0A= > +package org.apache.cxf.fediz.service.idp.beans;=0A= > +=0A= > +import org.apache.cxf.fediz.service.idp.util.WebUtils;=0A= > +import org.springframework.webflow.execution.RequestContext;=0A= > +=0A= > +/**=0A= > + * @author fr17993 This class is responsible to invalidate IDP session.= =0A= > + */=0A= > +=0A= > +public class LogoutAction {=0A= > +=0A= > + public void submit(RequestContext requestContext) {=0A= > + WebUtils.getHttpSession(requestContext).invalidate();=0A= > + }=0A= > +}=0A= >=0A= > Added:=0A= > cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/i= dp/beans/STSClientAction.java=0A= > URL:=0A= > http://svn.apache.org/viewvc/cxf/fediz/trunk/services/idp/src/main/java/o= rg/apache/cxf/fediz/service/idp/beans/STSClientAction.java?rev=3D1462277&vi= ew=3Dauto=0A= >=0A= > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=0A= > ---=0A= > cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/i= dp/beans/STSClientAction.java=0A= > (added)=0A= > +++=0A= > cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/i= dp/beans/STSClientAction.java=0A= > Thu Mar 28 19:53:35 2013=0A= > @@ -0,0 +1,286 @@=0A= > +/**=0A= > + * Licensed to the Apache Software Foundation (ASF) under one=0A= > + * or more contributor license agreements. See the NOTICE file=0A= > + * distributed with this work for additional information=0A= > + * regarding copyright ownership. The ASF licenses this file=0A= > + * to you under the Apache License, Version 2.0 (the=0A= > + * "License"); you may not use this file except in compliance=0A= > + * with the License. You may obtain a copy of the License at=0A= > + *=0A= > + * http://www.apache.org/licenses/LICENSE-2.0=0A= > + *=0A= > + * Unless required by applicable law or agreed to in writing,=0A= > + * software distributed under the License is distributed on an=0A= > + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY=0A= > + * KIND, either express or implied. See the License for the=0A= > + * specific language governing permissions and limitations=0A= > + * under the License.=0A= > + */=0A= > +package org.apache.cxf.fediz.service.idp.beans;=0A= > +=0A= > +import java.net.MalformedURLException;=0A= > +import java.net.URL;=0A= > +import java.util.List;=0A= > +import java.util.Map;=0A= > +=0A= > +import javax.xml.namespace.QName;=0A= > +import javax.xml.parsers.ParserConfigurationException;=0A= > +import javax.xml.stream.XMLStreamException;=0A= > +=0A= > +import org.w3c.dom.Element;=0A= > +=0A= > +import org.apache.commons.lang3.StringEscapeUtils;=0A= > +import org.apache.cxf.Bus;=0A= > +import org.apache.cxf.BusFactory;=0A= > +import org.apache.cxf.fediz.service.idp.IdpSTSClient;=0A= > +import org.apache.cxf.fediz.service.idp.UsernamePasswordCredentials;=0A= > +import org.apache.cxf.fediz.service.idp.util.WebUtils;=0A= > +import org.apache.cxf.staxutils.W3CDOMStreamWriter;=0A= > +import org.apache.cxf.ws.security.SecurityConstants;=0A= > +import org.apache.cxf.ws.security.tokenstore.SecurityToken;=0A= > +import org.apache.cxf.ws.security.trust.STSUtils;=0A= > +import org.apache.ws.security.WSConstants;=0A= > +import org.slf4j.Logger;=0A= > +import org.slf4j.LoggerFactory;=0A= > +import org.springframework.context.ApplicationContext;=0A= > +import org.springframework.webflow.execution.RequestContext;=0A= > +=0A= > +/**=0A= > + * @author fr17993=0A= > +This class is responsible to ask for Security Tokens to STS.=0A= > + */=0A= > +=0A= > +public class STSClientAction {=0A= > +=0A= > + private static final String REALM_TO_CLAIMS_MAP =3D "realm2ClaimsMap= ";=0A= > +=0A= > + private static final String=0A= > HTTP_SCHEMAS_XMLSOAP_ORG_WS_2005_05_IDENTITY =3D=0A= > + "http://schemas.xmlsoap.org/ws/2005/05/identity";=0A= > +=0A= > + private static final String=0A= > HTTP_DOCS_OASIS_OPEN_ORG_WS_SX_WS_TRUST_200512_BEARER =3D=0A= > + "http://docs.oasis-open.org/ws-sx/ws-trust/200512/Bearer";= =0A= > +=0A= > + private static final String HTTP_WWW_W3_ORG_2005_08_ADDRESSING =3D "= =0A= > http://www.w3.org/2005/08/addressing";=0A= > +=0A= > + private static final String=0A= > HTTP_DOCS_OASIS_OPEN_ORG_WS_SX_WS_TRUST_200512 =3D=0A= > + "http://docs.oasis-open.org/ws-sx/ws-trust/200512/";=0A= > +=0A= > + private static final String SECURITY_TOKEN_SERVICE =3D=0A= > "SecurityTokenService";=0A= > +=0A= > + private static final Logger LOG =3D LoggerFactory=0A= > + .getLogger(STSClientAction.class);=0A= > +=0A= > + protected String wsdlLocation;=0A= > +=0A= > + protected String wsdlEndpoint;=0A= > +=0A= > + protected String appliesTo;=0A= > +=0A= > + protected String tokenType;=0A= > +=0A= > + protected boolean claimsRequired =3D true;=0A= > +=0A= > + protected boolean isPortSet;=0A= > +=0A= > + public String getWsdlLocation() {=0A= > + return wsdlLocation;=0A= > + }=0A= > +=0A= > + public void setWsdlLocation(String wsdlLocation) {=0A= > + this.wsdlLocation =3D wsdlLocation;=0A= > + try {=0A= > + URL url =3D new URL(wsdlLocation);=0A= > + isPortSet =3D url.getPort() > 0;=0A= > + if (!isPortSet) {=0A= > + LOG.info("Port is 0 for 'wsdlLocation'. Port evaluated= =0A= > when processing first request.");=0A= > + }=0A= > + } catch (MalformedURLException e) {=0A= > + LOG.error("Invalid Url '" + wsdlLocation + "': " +=0A= > e.getMessage());=0A= > + }=0A= > + }=0A= > +=0A= > + public String getWsdlEndpoint() {=0A= > + return wsdlEndpoint;=0A= > + }=0A= > +=0A= > + public void setWsdlEndpoint(String wsdlEndpoint) {=0A= > + this.wsdlEndpoint =3D wsdlEndpoint;=0A= > + }=0A= > +=0A= > + public String getAppliesTo() {=0A= > + return appliesTo;=0A= > + }=0A= > +=0A= > + public void setAppliesTo(String appliesTo) {=0A= > + this.appliesTo =3D appliesTo;=0A= > + }=0A= > +=0A= > + public String getTokenType() {=0A= > + return tokenType;=0A= > + }=0A= > +=0A= > + public void setTokenType(String tokenType) {=0A= > + this.tokenType =3D tokenType;=0A= > + }=0A= > +=0A= > + public boolean isClaimsRequired() {=0A= > + return claimsRequired;=0A= > + }=0A= > +=0A= > + public void setClaimsRequired(boolean claimsRequired) {=0A= > + this.claimsRequired =3D claimsRequired;=0A= > + }=0A= > +=0A= > + /**=0A= > + * @param credentials=0A= > + * : username and password provided by user=0A= > + * @return a IDP {@link SecurityToken}=0A= > + * @throws Exception=0A= > + */=0A= > + public SecurityToken submit(UsernamePasswordCredentials credentials,= =0A= > RequestContext context)=0A= > + throws Exception {=0A= > +=0A= > + Bus bus =3D BusFactory.getDefaultBus();=0A= > +=0A= > + IdpSTSClient sts =3D new IdpSTSClient(bus);=0A= > + sts.setAddressingNamespace(HTTP_WWW_W3_ORG_2005_08_ADDRESSING);= =0A= > + paramTokenType(sts);=0A= > +=0A= > sts.setKeyType(HTTP_DOCS_OASIS_OPEN_ORG_WS_SX_WS_TRUST_200512_BEARER);= =0A= > +=0A= > + if (!isPortSet) {=0A= > + try {=0A= > + URL url =3D new URL(this.wsdlLocation);=0A= > + URL updatedUrl =3D new URL(url.getProtocol(), url.getHos= t(),=0A= > +=0A= > WebUtils.getHttpServletRequest(context).getLocalPort(), url.getFile());= =0A= > +=0A= > + setSTSWsdlUrl(updatedUrl.toString());=0A= > + LOG.info("STS WSDL URL updated to " +=0A= > updatedUrl.toString());=0A= > + } catch (MalformedURLException e) {=0A= > + LOG.error("Invalid Url '" + this.wsdlLocation + "': " += =0A= > e.getMessage());=0A= > + }=0A= > + }=0A= > + sts.setWsdlLocation(this.wsdlLocation);=0A= > + sts.setServiceQName(new QName(=0A= > + HTTP_DOCS_OASIS_OPEN_ORG_WS_SX_WS_TRUST_200512,=0A= > + SECURITY_TOKEN_SERVICE));=0A= > + sts.setEndpointQName(new QName(=0A= > + HTTP_DOCS_OASIS_OPEN_ORG_WS_SX_WS_TRUST_200512,=0A= > + this.wsdlEndpoint));=0A= > +=0A= > + if (this.claimsRequired) {=0A= > + addClaims(this.appliesTo, bus, sts);=0A= > + }=0A= > +=0A= > + sts.getProperties().put(SecurityConstants.USERNAME,=0A= > + credentials.getUsername());=0A= > + sts.getProperties().put(SecurityConstants.PASSWORD,=0A= > + credentials.getPassword());=0A= > +=0A= > + SecurityToken idpToken =3D sts.requestSecurityToken(this.applies= To);=0A= > +=0A= > + LOG.info("Token [IDP_TOKEN] produced succesfully.");=0A= > + return idpToken;=0A= > + }=0A= > +=0A= > + /**=0A= > + * @param credentials=0A= > + * {@link SecurityToken}=0A= > + * @param wtrealm=0A= > + * the relying party security domain=0A= > + * @return a serialized RP security token=0A= > + * @throws Exception=0A= > + */=0A= > + public String submit(SecurityToken credentials, String wtrealm)=0A= > + throws Exception {=0A= > +=0A= > + Bus bus =3D BusFactory.getDefaultBus();=0A= > +=0A= > + IdpSTSClient sts =3D new IdpSTSClient(bus);=0A= > + sts.setAddressingNamespace(HTTP_WWW_W3_ORG_2005_08_ADDRESSING);= =0A= > + paramTokenType(sts);=0A= > +=0A= > sts.setKeyType(HTTP_DOCS_OASIS_OPEN_ORG_WS_SX_WS_TRUST_200512_BEARER);= =0A= > +=0A= > + sts.setWsdlLocation(wsdlLocation);=0A= > + sts.setServiceQName(new QName(=0A= > + HTTP_DOCS_OASIS_OPEN_ORG_WS_SX_WS_TRUST_200512,=0A= > + SECURITY_TOKEN_SERVICE));=0A= > + sts.setEndpointQName(new QName(=0A= > + HTTP_DOCS_OASIS_OPEN_ORG_WS_SX_WS_TRUST_200512,=0A= > wsdlEndpoint));=0A= > +=0A= > + if (this.claimsRequired) {=0A= > + addClaims(wtrealm, bus, sts);=0A= > + }=0A= > +=0A= > + sts.setOnBehalfOf(credentials.getToken());=0A= > +=0A= > + String rpToken =3D sts.requestSecurityTokenResponse(wtrealm);=0A= > +=0A= > + LOG.info("Token [RP_TOKEN] produced succesfully.");=0A= > + return StringEscapeUtils.escapeXml(rpToken);=0A= > + }=0A= > +=0A= > + private void addClaims(String wtrealm, Bus bus, IdpSTSClient sts)=0A= > + throws ParserConfigurationException, XMLStreamException {=0A= > + List realmClaims =3D null;=0A= > + ApplicationContext ctx =3D (ApplicationContext) bus=0A= > + .getExtension(ApplicationContext.class);=0A= > +=0A= > + @SuppressWarnings("unchecked")=0A= > + Map> realmClaimsMap =3D (Map List>) ctx=0A= > + .getBean(REALM_TO_CLAIMS_MAP);=0A= > + realmClaims =3D realmClaimsMap.get(wtrealm);=0A= > + if (realmClaims !=3D null && realmClaims.size() > 0=0A= > + && LOG.isDebugEnabled()) {=0A= > + LOG.debug("claims for realm " + wtrealm);=0A= > + for (String item : realmClaims) {=0A= > + LOG.debug(" " + item);=0A= > + }=0A= > + }=0A= > + Element claims =3D createClaimsElement(realmClaims);=0A= > + if (claims !=3D null) {=0A= > + sts.setClaims(claims);=0A= > + }=0A= > + }=0A= > +=0A= > + private void paramTokenType(IdpSTSClient sts) {=0A= > + if (tokenType =3D=3D null) {=0A= > + sts.setTokenType(WSConstants.WSS_SAML2_TOKEN_TYPE);=0A= > + } else {=0A= > + sts.setTokenType(tokenType);=0A= > + }=0A= > + }=0A= > +=0A= > + private Element createClaimsElement(List realmClaims)=0A= > + throws ParserConfigurationException, XMLStreamException {=0A= > + if (realmClaims =3D=3D null || realmClaims.size() =3D=3D 0) {=0A= > + return null;=0A= > + }=0A= > +=0A= > + W3CDOMStreamWriter writer =3D new W3CDOMStreamWriter();=0A= > + writer.writeStartElement("wst", "Claims", STSUtils.WST_NS_05_12)= ;=0A= > + writer.writeNamespace("wst", STSUtils.WST_NS_05_12);=0A= > + writer.writeNamespace("ic",=0A= > + HTTP_SCHEMAS_XMLSOAP_ORG_WS_2005_05_IDENTITY);=0A= > + writer.writeAttribute("Dialect",=0A= > + HTTP_SCHEMAS_XMLSOAP_ORG_WS_2005_05_IDENTITY);=0A= > +=0A= > + if (realmClaims !=3D null && realmClaims.size() > 0) {=0A= > + for (String item : realmClaims) {=0A= > + LOG.debug("claim: " + item);=0A= > + writer.writeStartElement("ic", "ClaimType",=0A= > + HTTP_SCHEMAS_XMLSOAP_ORG_WS_2005_05_IDENTITY);= =0A= > + writer.writeAttribute("Uri", item);=0A= > + writer.writeEndElement();=0A= > + }=0A= > + }=0A= > +=0A= > + writer.writeEndElement();=0A= > +=0A= > + return writer.getDocument().getDocumentElement();=0A= > + }=0A= > +=0A= > + private synchronized void setSTSWsdlUrl(String wsdlUrl) {=0A= > + this.wsdlLocation =3D wsdlUrl;=0A= > + this.isPortSet =3D true;=0A= > + }=0A= > +}=0A= >=0A= > Added:=0A= > cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/i= dp/beans/WfreshParser.java=0A= > URL:=0A= > http://svn.apache.org/viewvc/cxf/fediz/trunk/services/idp/src/main/java/o= rg/apache/cxf/fediz/service/idp/beans/WfreshParser.java?rev=3D1462277&view= =3Dauto=0A= >=0A= > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=0A= > ---=0A= > cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/i= dp/beans/WfreshParser.java=0A= > (added)=0A= > +++=0A= > cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/i= dp/beans/WfreshParser.java=0A= > Thu Mar 28 19:53:35 2013=0A= > @@ -0,0 +1,52 @@=0A= > +/**=0A= > + * Licensed to the Apache Software Foundation (ASF) under one=0A= > + * or more contributor license agreements. See the NOTICE file=0A= > + * distributed with this work for additional information=0A= > + * regarding copyright ownership. The ASF licenses this file=0A= > + * to you under the Apache License, Version 2.0 (the=0A= > + * "License"); you may not use this file except in compliance=0A= > + * with the License. You may obtain a copy of the License at=0A= > + *=0A= > + * http://www.apache.org/licenses/LICENSE-2.0=0A= > + *=0A= > + * Unless required by applicable law or agreed to in writing,=0A= > + * software distributed under the License is distributed on an=0A= > + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY=0A= > + * KIND, either express or implied. See the License for the=0A= > + * specific language governing permissions and limitations=0A= > + * under the License.=0A= > + */=0A= > +package org.apache.cxf.fediz.service.idp.beans;=0A= > +=0A= > +import java.util.Date;=0A= > +import org.apache.cxf.ws.security.tokenstore.SecurityToken;=0A= > +import org.slf4j.Logger;=0A= > +import org.slf4j.LoggerFactory;=0A= > +=0A= > +/**=0A= > + * This class is responsible to parse 'wfresh' parameter=0A= > + * @author T.Beucher=0A= > + */=0A= > +=0A= > +public class WfreshParser {=0A= > +=0A= > + private static final Logger LOG =3D LoggerFactory=0A= > + .getLogger(WfreshParser.class);=0A= > +=0A= > + public boolean authenticationRequired(SecurityToken idpToken, String= =0A= > wfresh)=0A= > + throws Exception {=0A= > + long ttl =3D Long.parseLong(wfresh);=0A= > + if (ttl > 0) {=0A= > + Date createdDate =3D idpToken.getCreated();=0A= > + Date expiryDate =3D new Date();=0A= > + expiryDate.setTime(createdDate.getTime() + (ttl * 60L *=0A= > 1000L));=0A= > + if (expiryDate.before(new Date())) {=0A= > + LOG.info("IDP token is valid but relying party requested= =0A= > new authentication via wfresh: " + wfresh);=0A= > + return true;=0A= > + }=0A= > + } else {=0A= > + LOG.info("wfresh value of " + wfresh + " is invalid");=0A= > + }=0A= > + return false;=0A= > + }=0A= > +}=0A= >=0A= > Added:=0A= > cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/i= dp/util/WebUtils.java=0A= > URL:=0A= > http://svn.apache.org/viewvc/cxf/fediz/trunk/services/idp/src/main/java/o= rg/apache/cxf/fediz/service/idp/util/WebUtils.java?rev=3D1462277&view=3Daut= o=0A= >=0A= > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=0A= > ---=0A= > cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/i= dp/util/WebUtils.java=0A= > (added)=0A= > +++=0A= > cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/i= dp/util/WebUtils.java=0A= > Thu Mar 28 19:53:35 2013=0A= > @@ -0,0 +1,177 @@=0A= > +/**=0A= > + * Licensed to the Apache Software Foundation (ASF) under one=0A= > + * or more contributor license agreements. See the NOTICE file=0A= > + * distributed with this work for additional information=0A= > + * regarding copyright ownership. The ASF licenses this file=0A= > + * to you under the Apache License, Version 2.0 (the=0A= > + * "License"); you may not use this file except in compliance=0A= > + * with the License. You may obtain a copy of the License at=0A= > + *=0A= > + * http://www.apache.org/licenses/LICENSE-2.0=0A= > + *=0A= > + * Unless required by applicable law or agreed to in writing,=0A= > + * software distributed under the License is distributed on an=0A= > + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY=0A= > + * KIND, either express or implied. See the License for the=0A= > + * specific language governing permissions and limitations=0A= > + * under the License.=0A= > + */=0A= > +package org.apache.cxf.fediz.service.idp.util;=0A= > +=0A= > +import javax.servlet.http.HttpServletRequest;=0A= > +import javax.servlet.http.HttpServletResponse;=0A= > +import javax.servlet.http.HttpSession;=0A= > +=0A= > +import org.springframework.util.Assert;=0A= > +import org.springframework.webflow.context.servlet.ServletExternalContex= t;=0A= > +import org.springframework.webflow.execution.RequestContext;=0A= > +=0A= > +/**=0A= > + * @author fr17993=0A= > + * Utility class to bind with webflow artifacts=0A= > + */=0A= > +public final class WebUtils {=0A= > +=0A= > + private WebUtils() {=0A= > + super();=0A= > + }=0A= > +=0A= > + public static HttpServletRequest getHttpServletRequest(=0A= > + final RequestContext context) {=0A= > + Assert.isInstanceOf(ServletExternalContext.class,=0A= > + context.getExternalContext(),=0A= > + "Cannot obtain HttpServletRequest from event of type: "= =0A= > + +=0A= > context.getExternalContext().getClass().getName());=0A= > + return (HttpServletRequest) context.getExternalContext()=0A= > + .getNativeRequest();=0A= > + }=0A= > +=0A= > + public static HttpSession getHttpSession(final RequestContext=0A= > context) {=0A= > + HttpServletRequest httpServletRequest =3D=0A= > getHttpServletRequest(context);=0A= > + return httpServletRequest.getSession();=0A= > + }=0A= > +=0A= > + public static HttpServletResponse getHttpServletResponse(=0A= > + final RequestContext context) {=0A= > + Assert.isInstanceOf(ServletExternalContext.class,=0A= > + context.getExternalContext(),=0A= > + "Cannot obtain HttpServletResponse from event of type: "= =0A= > + +=0A= > context.getExternalContext().getClass().getName());=0A= > + return (HttpServletResponse) context.getExternalContext()=0A= > + .getNativeResponse();=0A= > + }=0A= > +=0A= > + public static void putAttributeInRequestScope(final RequestContext= =0A= > context,=0A= > + final String attributeKey, final Object attributeValue) {=0A= > + context.getRequestScope().put(attributeKey, attributeValue);=0A= > + }=0A= > +=0A= > + public static void putAttributeInExternalContext(=0A= > + final RequestContext context, final String attributeKey,=0A= > + final Object attributeValue) {=0A= > + context.getExternalContext().getSessionMap()=0A= > + .put(attributeKey, attributeValue);=0A= > + }=0A= > +=0A= > + /**=0A= > + * put attribute in request or in session depending on storeInSessio= n.=0A= > + *=0A= > + * @param context=0A= > + * @param attributeKey=0A= > + * @return=0A= > + */=0A= > + public static void putAttribute(final RequestContext context,=0A= > + final String attributeKey, final Object attributeValue,=0A= > + boolean storeInSession) {=0A= > + // Object oldValue =3D null;=0A= > + if (storeInSession) {=0A= > + // oldValue =3D getAttributeFromExternalContext(context,=0A= > + // attributeKey);=0A= > + putAttributeInExternalContext(context, attributeKey,=0A= > attributeValue);=0A= > + } else {=0A= > + // oldValue =3D getAttributeFromRequestScope(context,=0A= > attributeKey);=0A= > + putAttributeInRequestScope(context, attributeKey,=0A= > attributeValue);=0A= > + }=0A= > + // return oldValue;=0A= > + }=0A= > +=0A= > + public static Object getAttributeFromRequestScope(=0A= > + final RequestContext context, final String attributeKey) {= =0A= > + return context.getRequestScope().getString(attributeKey);=0A= > + }=0A= > +=0A= > + public static Object getAttributeFromExternalContext(=0A= > + final RequestContext context, final String attributeKey) {= =0A= > + return context.getExternalContext().getSessionMap()=0A= > + .getString(attributeKey);=0A= > + }=0A= > +=0A= > + /**=0A= > + * get attribute from request; if not found get it from session.=0A= > + *=0A= > + * @param context=0A= > + * @param attributeKey=0A= > + * @return=0A= > + */=0A= > + public static Object getAttribute(final RequestContext context,=0A= > + final String attributeKey) {=0A= > + Object value =3D getAttributeFromRequestScope(context,=0A= > attributeKey);=0A= > + if (value !=3D null) {=0A= > + return value;=0A= > + }=0A= > + return getAttributeFromExternalContext(context, attributeKey);= =0A= > + }=0A= > +=0A= > + public static Object removeAttributeFromRequestScope(=0A= > + final RequestContext context, final String attributeKey) {= =0A= > + return context.getRequestScope().remove(attributeKey);=0A= > + }=0A= > +=0A= > + public static Object removeAttributeFromExternalContext(=0A= > + final RequestContext context, final String attributeKey) {= =0A= > + return context.getExternalContext().getSessionMap()=0A= > + .remove(attributeKey);=0A= > + }=0A= > +=0A= > + /**=0A= > + * remove attribute from request and session.=0A= > + *=0A= > + * @param context=0A= > + * @param attributeKey=0A= > + * @return=0A= > + */=0A= > + public static Object removeAttribute(final RequestContext context,= =0A= > + final String attributeKey) {=0A= > + Object valueReq =3D removeAttributeFromRequestScope(context,=0A= > attributeKey);=0A= > + Object valueSes =3D removeAttributeFromExternalContext(context,= =0A= > + attributeKey);=0A= > + if (valueSes !=3D null) {=0A= > + return valueSes; // not clean if request has different value= !=0A= > + }=0A= > + if (valueReq !=3D null) {=0A= > + return valueReq;=0A= > + }=0A= > + return null;=0A= > + }=0A= > +=0A= > + public static void putAttributeInFlowScope(final RequestContext=0A= > context,=0A= > + final String attributeKey, final String attributeValue) {=0A= > + context.getFlowScope().put(attributeKey, attributeValue);=0A= > + }=0A= > +=0A= > + public static String getAttributeFromFlowScope(=0A= > + final RequestContext context, final String attributeKey) {= =0A= > + return context.getFlowScope().getString(attributeKey);=0A= > + }=0A= > +=0A= > + public static Object removeAttributeFromFlowScope(=0A= > + final RequestContext context, final String attributeKey) {= =0A= > + return context.getFlowScope().remove(attributeKey);=0A= > + }=0A= > +=0A= > + public static String getParamFromRequestParameters(=0A= > + final RequestContext context, final String attributeKey) {= =0A= > + return context.getRequestParameters().get(attributeKey);=0A= > + }=0A= > +=0A= > +}=0A= >=0A= > Modified: cxf/fediz/trunk/services/idp/src/main/resources/log4j.propertie= s=0A= > URL:=0A= > http://svn.apache.org/viewvc/cxf/fediz/trunk/services/idp/src/main/resour= ces/log4j.properties?rev=3D1462277&r1=3D1462276&r2=3D1462277&view=3Ddiff=0A= >=0A= > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=0A= > --- cxf/fediz/trunk/services/idp/src/main/resources/log4j.properties=0A= > (original)=0A= > +++ cxf/fediz/trunk/services/idp/src/main/resources/log4j.properties Thu= =0A= > Mar 28 19:53:35 2013=0A= > @@ -1,6 +1,6 @@=0A= > # Set root category priority to INFO and its only appender to CONSOLE.= =0A= > -log4j.rootCategory=3DFATAL, CONSOLE=0A= > -#log4j.rootCategory=3DDEBUG, CONSOLE=0A= > +#log4j.rootCategory=3DFATAL, CONSOLE=0A= > +log4j.rootCategory=3DDEBUG, CONSOLE=0A= >=0A= > # CONSOLE is set to be a ConsoleAppender using a PatternLayout.=0A= > log4j.appender.CONSOLE=3Dorg.apache.log4j.ConsoleAppender=0A= >=0A= > Modified:=0A= > cxf/fediz/trunk/services/idp/src/main/resources/logging.properties=0A= > URL:=0A= > http://svn.apache.org/viewvc/cxf/fediz/trunk/services/idp/src/main/resour= ces/logging.properties?rev=3D1462277&r1=3D1462276&r2=3D1462277&view=3Ddiff= =0A= >=0A= > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=0A= > --- cxf/fediz/trunk/services/idp/src/main/resources/logging.properties=0A= > (original)=0A= > +++ cxf/fediz/trunk/services/idp/src/main/resources/logging.properties Th= u=0A= > Mar 28 19:53:35 2013=0A= > @@ -39,6 +39,7 @@ java.util.logging.FileHandler.formatter=0A= >=0A= > # Limit the message that are printed on the console to WARNING and above= .=0A= > java.util.logging.ConsoleHandler.level =3D FINEST=0A= > +java.util.logging.SimpleFormatter.format=3D"IDP %1$tc %2$s%n%4$s:=0A= > %5$s%6$s%n"=0A= > java.util.logging.ConsoleHandler.formatter =3D=0A= > java.util.logging.SimpleFormatter=0A= >=0A= >=0A= > @@ -50,4 +51,6 @@ java.util.logging.ConsoleHandler.formatt=0A= > # For example, set the com.xyz.foo logger to only log SEVERE=0A= > # messages:=0A= > #com.xyz.foo.level =3D SEVERE=0A= > -org.apache.cxf.fediz.service.idp.level =3D FINEST=0A= > +org.apache.cxf.fediz.service.idp.level =3D FINE=0A= > +org.springframework.web.level =3D FINE=0A= > +org.springframework.webflow.level =3D FINE=0A= > \ No newline at end of file=0A= >=0A= > Modified:=0A= > cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/applicationContext.x= ml=0A= > URL:=0A= > http://svn.apache.org/viewvc/cxf/fediz/trunk/services/idp/src/main/webapp= /WEB-INF/applicationContext.xml?rev=3D1462277&r1=3D1462276&r2=3D1462277&vie= w=3Ddiff=0A= >=0A= > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=0A= > ---=0A= > cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/applicationContext.x= ml=0A= > (original)=0A= > +++=0A= > cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/applicationContext.x= ml=0A= > Thu Mar 28 19:53:35 2013=0A= > @@ -33,7 +33,7 @@=0A= > =0A= > =0A= > =0A= > -=0A= > +=0A= > =0A= >=0A= > =0A= >=0A= > Added:=0A= > cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/federation-webflow.x= ml=0A= > URL:=0A= > http://svn.apache.org/viewvc/cxf/fediz/trunk/services/idp/src/main/webapp= /WEB-INF/federation-webflow.xml?rev=3D1462277&view=3Dauto=0A= >=0A= > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=0A= > ---=0A= > cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/federation-webflow.x= ml=0A= > (added)=0A= > +++=0A= > cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/federation-webflow.x= ml=0A= > Thu Mar 28 19:53:35 2013=0A= > @@ -0,0 +1,144 @@=0A= > +=0A= > + + xmlns:xsi=3D"http://www.w3.org/2001/XMLSchema-instance"=0A= > + xsi:schemaLocation=3D"http://www.springframework.org/schema/webflow= =0A= > +=0A= > http://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd">=0A= > +=0A= > + =0A= > + expression=3D"initialFlowSetupAction.submit(flowRequestContext)" />=0A= > + =0A= > +=0A= > + =0A= > + =0A= > + =0A= > + value=3D"requestParameters.wtrealm" />=0A= > + value=3D"requestParameters.wreply" />=0A= > + value=3D"requestParameters.wctx" />=0A= > + =0A= > + =0A= > + requestParameters.wa !=3D 'wsignout1.0' and requestParameters.wa !=3D=0A= > 'wsignoutcleanup1.0'" then=3D"viewBadRequest" />=0A= > + requestParameters.wa =3D=3D 'wsignoutcleanup1.0'"=0A= > then=3D"invalidateSessionAction" />=0A= > + requestParameters.wtrealm.length() =3D=3D 0" then=3D"viewBadRequest" />= =0A= > +=0A= > + then=3D"authenticationRequired" />=0A= > + true" then=3D"authenticationRequired" />=0A= > + requestParameters.wfresh.equals('0')" then=3D"authenticationRequired"=0A= > else=3D"rpTokenAction" />=0A= > + =0A= > +=0A= > + =0A= > + =0A= > + =0A= > + value=3D"null" />=0A= > + =0A= > + then=3D"formAuthenticationView" />=0A= > + then=3D"basicAuthenticationCheck" else=3D"viewBadRequest" />=0A= > + =0A= > +=0A= > + =0A= > + model=3D"usernamePasswordCredentials">=0A= > + +=0A= > class=3D"org.apache.cxf.fediz.service.idp.UsernamePasswordCredentials" /= >=0A= > + =0A= > + =0A= > + =0A= > + =0A= > + =0A= > + expression=3D"externalContext.nativeResponse.setHeader('Cache-Control',= =0A= > 'no-store, no-cache, must-revalidate, private')" />=0A= > + =0A= > + to=3D"idpUsernamePasswordTokenAction">=0A= > + value=3D"usernamePasswordCredentials" />=0A= > + =0A= > + =0A= > +=0A= > + =0A= > + =0A= > + test=3D"externalContext.nativeRequest.getHeader('Authorization') =3D=3D n= ull"=0A= > then=3D"basicAuthenticationRequested" else=3D"decodeBasicAuthenticationAc= tion"=0A= > />=0A= > + =0A= > +=0A= > + =0A= > + =0A= > + =0A= > + expression=3D"externalContext.nativeResponse.setHeader('WWW-Authenticate'= ,=0A= > 'Basic realm=3D'+flowScope.idpName)" />=0A= > + expression=3D"externalContext.nativeResponse.setHeader('Cache-Control',= =0A= > 'no-store, no-cache, must-revalidate, private')" />=0A= > + expression=3D"externalContext.nativeResponse.setStatus(401,'Invalid=0A= > credentials')" />=0A= > + />=0A= > + =0A= > + =0A= > +=0A= > + =0A= > + =0A= > + expression=3D"decodeAuthorizationHeaderAction.submit(flowRequestContext)"= =0A= > + result=3D"flowScope.usernamePasswordCredentials"=0A= > +=0A= > result-type=3D"org.apache.cxf.fediz.service.idp.UsernamePasswordCredenti= als"=0A= > />=0A= > + =0A= > + to=3D"scInternalServerError" />=0A= > + =0A= > +=0A= > + =0A= > + =0A= > + =0A= > + expression=3D"stsClientForIdpAction.submit(flowScope.usernamePasswordCred= entials,flowRequestContext)"=0A= > + result=3D"flowScope.idpToken"=0A= > +=0A= > result-type=3D"org.apache.cxf.ws.security.tokenstore.SecurityToken" />= =0A= > + =0A= > + value=3D"flowScope.idpToken" />=0A= > + value=3D"flowScope.usernamePasswordCredentials.username" />=0A= > + =0A= > + to=3D"authenticationFailedSwitch" />=0A= > + to=3D"scInternalServerError" />=0A= > + =0A= > +=0A= > + =0A= > + =0A= > + then=3D"formAuthenticationView" />=0A= > + then=3D"basicAuthenticationRequested" />=0A= > + =0A= > +=0A= > + =0A= > + =0A= > + expression=3D"stsClientForRpAction.submit(externalContext.sessionMap['IDP= _TOKEN'],=0A= > externalContext.sessionMap['wtrealm'])"=0A= > + result=3D"flowScope.rpToken"=0A= > + result-type=3D"java.lang.String" />=0A= > + =0A= > + to=3D"scInternalServerError" />=0A= > + =0A= > +=0A= > + =0A= > + =0A= > + =0A= > + =0A= > + result=3D"requestScope.fedAction" />=0A= > + result=3D"requestScope.fedWTrealm" />=0A= > + result=3D"requestScope.fedWCtx" />=0A= > + result=3D"requestScope.fedWResult" />=0A= > + =0A= > + =0A= > +=0A= > + =0A= > + =0A= > + =0A= > + expression=3D"externalContext.nativeResponse.setStatus(400,flowRequestCon= text.currentTransition.toString())"=0A= > />=0A= > + value=3D"flowRequestContext.currentTransition" />=0A= > + =0A= > + =0A= > +=0A= > + =0A= > + =0A= > + =0A= > + expression=3D"externalContext.nativeResponse.setStatus(500,'IDP is=0A= > unavailable, please contact the administrator')" />=0A= > + please contact the administrator'" />=0A= > + =0A= > + =0A= > +=0A= > + =0A= > + =0A= > + =0A= > + =0A= > + to=3D"scInternalServerError" />=0A= > + =0A= > +=0A= > + =0A= > + =0A= > +=0A= > +=0A= >=0A= > Added:=0A= > cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/genericerror.jsp=0A= > URL:=0A= > http://svn.apache.org/viewvc/cxf/fediz/trunk/services/idp/src/main/webapp= /WEB-INF/genericerror.jsp?rev=3D1462277&view=3Dauto=0A= >=0A= > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=0A= > --- cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/genericerror.jsp= =0A= > (added)=0A= > +++ cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/genericerror.jsp= =0A= > Thu Mar 28 19:53:35 2013=0A= > @@ -0,0 +1,11 @@=0A= > + http://www.w3.org/TR/html4/loose.dtd">=0A= > +=0A= > +=0A= > +=0A= > +IDP generic error page=0A= > +=0A= > +=0A= > +

Sorry, CXF Fediz IDP cannot satisfy your request.

=0A= > +

Reason : ${reason}

=0A= > +=0A= > +=0A= > \ No newline at end of file=0A= >=0A= > Added: cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/idp-servlet.x= ml=0A= > URL:=0A= > http://svn.apache.org/viewvc/cxf/fediz/trunk/services/idp/src/main/webapp= /WEB-INF/idp-servlet.xml?rev=3D1462277&view=3Dauto=0A= >=0A= > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=0A= > --- cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/idp-servlet.xml= =0A= > (added)=0A= > +++ cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/idp-servlet.xml= =0A= > Thu Mar 28 19:53:35 2013=0A= > @@ -0,0 +1,74 @@=0A= > +=0A= > +=0A= > + + xmlns:xsi=3D"http://www.w3.org/2001/XMLSchema-instance"=0A= > + xmlns:webflow=3D"=0A= > http://www.springframework.org/schema/webflow-config"=0A= > + xmlns:p=3D"http://www.springframework.org/schema/p"=0A= > + xsi:schemaLocation=3D"http://www.springframework.org/schema/beans= =0A= > http://www.springframework.org/schema/beans/spring-beans-3.0.xsd=0A= > + http://www.springframework.org/schema/webflow-config=0A= > http://www.springframework.org/schema/webflow-config/spring-webflow-confi= g-2.0.xsd=0A= > ">=0A= > +=0A= > + + p:flowRegistry-ref=3D"flowRegistry"=0A= > + p:order=3D"2">=0A= > +=0A= > +=0A= > +=0A= > + =0A= > +=0A= > + class=3D"org.springframework.webflow.mvc.servlet.FlowHandlerAdapter"=0A= > + p:flowExecutor-ref=3D"flowExecutor" />=0A= > +=0A= > + =0A= > + =0A= > + =0A= > + =0A= > + =0A= > +=0A= > + flow-builder-services=3D"builder">=0A= > + id=3D"federation" />=0A= > + =0A= > +=0A= > + view-factory-creator=3D"viewFactoryCreator"=0A= > + expression-parser=3D"expressionParser"/= >=0A= > +=0A= > + class=3D"org.springframework.webflow.expression.WebFlowOgnlExpressionPars= er"=0A= > />=0A= > +=0A= > + class=3D"org.springframework.webflow.mvc.builder.MvcViewFactoryCreator">= =0A= > + =0A= > + =0A= > + =0A= > + =0A= > + =0A= > + =0A= > +=0A= > + class=3D"org.springframework.web.servlet.view.InternalResourceViewResolve= r">=0A= > + =0A= > + =0A= > + =0A= > +=0A= > + class=3D"org.apache.cxf.fediz.service.idp.beans.STSClientAction">=0A= > + https://localhost:0/fediz-idp-sts/STSService?wsdl"/>=0A= > + =0A= > + =0A= > + http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV2.0= =0A= > "/>=0A= > + =0A= > + =0A= > +=0A= > + class=3D"org.apache.cxf.fediz.service.idp.beans.STSClientAction">=0A= > + https://localhost:9443/fediz-idp-sts/STSServiceTransport?wsdl"/>=0A= > + =0A= > + http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV2.0= =0A= > "/>=0A= > + =0A= > + =0A= > +=0A= > + class=3D"org.apache.cxf.fediz.service.idp.beans.LogoutAction" />=0A= > +=0A= > + class=3D"org.apache.cxf.fediz.service.idp.beans.DecodeAuthorizationHeader= Action"=0A= > />=0A= > +=0A= > + class=3D"org.apache.cxf.fediz.service.idp.beans.InitialFlowSetupAction" >= =0A= > +=0A= > + =0A= > + =0A= > + =0A= > +=0A= > +=0A= >=0A= > Modified:=0A= > cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/signinform.jsp=0A= > URL:=0A= > http://svn.apache.org/viewvc/cxf/fediz/trunk/services/idp/src/main/webapp= /WEB-INF/signinform.jsp?rev=3D1462277&r1=3D1462276&r2=3D1462277&view=3Ddiff= =0A= >=0A= > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=0A= > --- cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/signinform.jsp= =0A= > (original)=0A= > +++ cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/signinform.jsp= =0A= > Thu Mar 28 19:53:35 2013=0A= > @@ -1,43 +1,18 @@=0A= > -<%@ page import=3D"java.util.Set"%>=0A= > -<%@ page import=3D"java.util.HashSet"%>=0A= > -<%@ page import=3D"java.lang.reflect.Field"%>=0A= > -<%@ page import=3D"org.apache.cxf.fediz.service.idp.FederationFilter"%>= =0A= > -<%@ page=0A= > import=3D"org.apache.cxf.fediz.service.idp.HttpFormAuthenticationFilter"%= >=0A= > -<%@ page import=3D"org.apache.cxf.fediz.service.idp.IdpServlet"%>=0A= > -=0A= > -<%@ page language=3D"java" contentType=3D"text/html; charset=3DISO-8859-= 1"=0A= > pageEncoding=3D"ISO-8859-1"%>=0A= > -=0A= > http://www.w3.org/TR/html4/loose.dtd">=0A= > +<%@ taglib prefix=3D"spring" uri=3D"http://www.springframework.org/tags"= %>=0A= > +<%@ taglib prefix=3D"form" uri=3D"http://www.springframework.org/tags/fo= rm"=0A= > %>=0A= > =0A= > =0A= > IDP SignIn Request Form=0A= > =0A= > =0A= > -
=0A= > - <%--=0A= > - Replicating the context.=0A= > - --%>=0A= > - <%=0A= > - Set ctx =3D new HashSet();=0A= > - Field[] fields =3D FederationFilter.class.getFields();=0A= > - for (Field f : fields) {=0A= > - if(f.getName().startsWith("PARAM_") &&=0A= > String.class.equals(f.getType())) {=0A= > - String key =3D (String) f.get(null);=0A= > - Object value =3D request.getAttribute(key= );=0A= > - if(null !=3D value && value instanceof=0A= > String) {=0A= > - %>=0A= > - " value=3D"<%=3D= value%>"=0A= > readonly=3D"readonly" />=0A= > - <%=0A= > - }=0A= > - }=0A= > - }=0A= > - %>=0A= > - name=3D"<%=3DHttpFormAuthenticationFilter.PARAM_TAG%>"=0A= > value=3D"<%=3DHttpFormAuthenticationFilter.PARAM_TAG%>" readonly=3D"reado= nly" />=0A= > - userid :=0A= > - name=3D"<%=3DHttpFormAuthenticationFilter.PARAM_USERNAME%>" size=3D"32" /= >
=0A= > - password :=0A= > - name=3D"<%=3DHttpFormAuthenticationFilter.PARAM_PASSWORD%>" size=3D"32" /= >
=0A= > - =0A= > - =0A= > +

IDP SignIn Request Form

=0A= > + =0A= > +
=0A= > + userid : />
=0A= > + password : size=3D"32" />
=0A= > + value=3D"${flowExecutionKey}"/>=0A= > + value=3D"Authenticate" />
=0A= > + =0A= > =0A= > =0A= > \ No newline at end of file=0A= >=0A= > Added:=0A= > cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/signinresponseform.j= sp=0A= > URL:=0A= > http://svn.apache.org/viewvc/cxf/fediz/trunk/services/idp/src/main/webapp= /WEB-INF/signinresponseform.jsp?rev=3D1462277&view=3Dauto=0A= >=0A= > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=0A= > ---=0A= > cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/signinresponseform.j= sp=0A= > (added)=0A= > +++=0A= > cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/signinresponseform.j= sp=0A= > Thu Mar 28 19:53:35 2013=0A= > @@ -0,0 +1,21 @@=0A= > + http://www.w3.org/TR/html4/loose.dtd">=0A= > +<%@ taglib prefix=3D"spring" uri=3D"http://www.springframework.org/tags"= %>=0A= > +<%@ taglib prefix=3D"form" uri=3D"http://www.springframework.org/tags/fo= rm"=0A= > %>=0A= > +=0A= > +=0A= > +IDP SignIn Response Form=0A= > +=0A= > +=0A= > + name=3D"signinresponseform" action=3D"${fedAction}" htmlEscape=3D"true">= =0A= > +
= =0A= > +
=0A= > +
=0A= > +
=0A= > + =0A= > + =0A= > + language=3D"javascript">window.setTimeout('document.forms[0].submit()',0)= ;=0A= > +=0A= > +=0A= >=0A= > Added:=0A= > cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/signoutresponse.jsp= =0A= > URL:=0A= > http://svn.apache.org/viewvc/cxf/fediz/trunk/services/idp/src/main/webapp= /WEB-INF/signoutresponse.jsp?rev=3D1462277&view=3Dauto=0A= >=0A= > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=0A= > ---=0A= > cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/signoutresponse.jsp= =0A= > (added)=0A= > +++=0A= > cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/signoutresponse.jsp= =0A= > Thu Mar 28 19:53:35 2013=0A= > @@ -0,0 +1,11 @@=0A= > + http://www.w3.org/TR/html4/loose.dtd">=0A= > +<%@ taglib prefix=3D"spring" uri=3D"http://www.springframework.org/tags"= %>=0A= > +<%@ taglib prefix=3D"form" uri=3D"http://www.springframework.org/tags/fo= rm"=0A= > %>=0A= > +=0A= > +=0A= > +IDP SignOut Response Page=0A= > +=0A= > +=0A= > +

CXF Fediz IDP succesfully logout.

=0A= > +=0A= > +=0A= >=0A= > Modified: cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/web.xml=0A= > URL:=0A= > http://svn.apache.org/viewvc/cxf/fediz/trunk/services/idp/src/main/webapp= /WEB-INF/web.xml?rev=3D1462277&r1=3D1462276&r2=3D1462277&view=3Ddiff=0A= >=0A= > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=0A= > --- cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/web.xml (origina= l)=0A= > +++ cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/web.xml Thu Mar= =0A= > 28 19:53:35 2013=0A= > @@ -1,285 +1,36 @@=0A= > - http://www.w3.org/2001/XMLSchema-instance"=0A= > - xsi:schemaLocation=3D"http://java.sun.com/xml/ns/javaee=0A= > - http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"= =0A= > - version=3D"3.0" metadata-complete=3D"true">=0A= > -=0A= > - =0A= > - WS Federation Tomcat Example=0A= > - =0A= > - WS Federation Tomcat Example=0A= > -=0A= > - =0A= > - FederationFilter=0A= > -=0A= > org.apache.cxf.fediz.service.idp.FederationFilter=0A= > - =0A= > - =0A= > - =0A= > - session.token=0A= > - IDP_TOKEN=0A= > - =0A= > -=0A= > - =0A= > -=0A= > - =0A= > - AuthenticationFilter=0A= > -=0A= > org.apache.cxf.fediz.service.idp.AuthenticationFilter=0A= > - =0A= > - pre-state=0A= > - AUTHENTICATION_REQUIRED=0A= > - =0A= > - =0A= > -=0A= > - =0A= > - BasicAuthenticationFilter=0A= > -=0A= > org.apache.cxf.fediz.service.idp.BasicAuthenticationFilter<= /filter-class>=0A= > - =0A= > - pre-state=0A= > -=0A= > USERNAME_PASSWORD_REQUIRED=0A= > - =0A= > - =0A= > - next-state=0A= > - SECURITY_TOKEN_REQUIRED=0A= > - =0A= > - =0A= > -=0A= > - =0A= > - FormAuthenticationFilter=0A= > -=0A= > org.apache.cxf.fediz.service.idp.HttpFormAuthenticationFilt= er=0A= > - =0A= > - pre-state=0A= > -=0A= > USERNAME_PASSWORD_REQUIRED=0A= > - =0A= > - =0A= > - next-state=0A= > - SECURITY_TOKEN_REQUIRED=0A= > - =0A= > - =0A= > -=0A= > - =0A= > - STSClientFilterRequestor=0A= > -=0A= > org.apache.cxf.fediz.service.idp.STSClientFilter=0A= > - =0A= > - pre-state=0A= > - SECURITY_TOKEN_REQUIRED=0A= > - =0A= > - =0A= > - next-state=0A= > - SECURITY_TOKEN_REQUIRED=0A= > - =0A= > - =0A= > - sts.wsdl.url=0A= > - =0A= > https://localhost:0/fediz-idp-sts/STSService?wsdl=0A= > - =0A= > - =0A= > - sts.wsdl.service=0A= > - SecurityTokenService= =0A= > - =0A= > - =0A= > - sts.wsdl.endpoint=0A= > - TransportUT_Port=0A= > - =0A= > - =0A= > - sts.auth-type=0A= > - USERNAME_PASSWORD=0A= > - =0A= > - =0A= > - sts.applies-to=0A= > - urn:fediz:idp=0A= > - =0A= > - =0A= > - token.store.name=0A= > - IDP_TOKEN=0A= > - =0A= > - =0A= > - =0A= > - sts.rstr.content-type=0A= > - TOKEN=0A= > - =0A= > - =0A= > - sts.use.wfresh.for.ttl= =0A= > - true=0A= > - =0A= > - =0A= > -=0A= > - =0A= > - STSClientFilterRP=0A= > -=0A= > org.apache.cxf.fediz.service.idp.STSClientFilter=0A= > - =0A= > - pre-state=0A= > - SECURITY_TOKEN_REQUIRED=0A= > - =0A= > - =0A= > - next-state=0A= > - AUTHENTICATED=0A= > - =0A= > - =0A= > - sts.wsdl.url=0A= > - =0A= > https://localhost:0/fediz-idp-sts/STSServiceTransport?wsdl= =0A= > - =0A= > - =0A= > - sts.wsdl.service=0A= > - SecurityTokenService= =0A= > - =0A= > - =0A= > - sts.wsdl.endpoint=0A= > - Transport_Port=0A= > - =0A= > - =0A= > - sts.auth-type=0A= > - NONE=0A= > - =0A= > - =0A= > - sts.applies-to=0A= > - $wtrealm=0A= > - =0A= > - =0A= > - sts.onbehalfof.token.name=0A= > - IDP_TOKEN=0A= > - =0A= > - =0A= > - token.store.name=0A= > - RP_TOKEN=0A= > - =0A= > - =0A= > - sts.rstr.content-type=0A= > - RSTR=0A= > - =0A= > - =0A= > - sts.claims.required=0A= > - true=0A= > - =0A= > - =0A= > -=0A= > - =0A= > - FederationPostFilter=0A= > -=0A= > org.apache.cxf.fediz.service.idp.FederationPostFilter=0A= > - =0A= > - pre-state=0A= > - AUTHENTICATED=0A= > - =0A= > - =0A= > - next-state=0A= > - AUTHENTICATED=0A= > - =0A= > - =0A= > - token.store.name=0A= > - RP_TOKEN=0A= > - =0A= > - =0A= > -=0A= > - =0A= > - LogoutFilter=0A= > -=0A= > org.apache.cxf.fediz.service.idp.LogoutFilter=0A= > - =0A= > - pre-state=0A= > - AUTHENTICATED=0A= > - =0A= > - =0A= > - logout.uri=0A= > - logout=0A= > - =0A= > - =0A= > -=0A= > - =0A= > - SessionCacheFilter=0A= > -=0A= > org.apache.cxf.fediz.service.idp.SessionCacheFilter=0A= > - =0A= > - pre-state=0A= > - AUTHENTICATED=0A= > - =0A= > - =0A= > - next-state=0A= > - AUTHENTICATED=0A= > - =0A= > - =0A= > - item1=0A= > - IDP_PRINCIPAL=0A= > - =0A= > - =0A= > - item2=0A= > - IDP_TOKEN=0A= > - =0A= > - =0A= > -=0A= > -=0A= > -=0A= > - =0A= > - FederationFilter=0A= > - /*=0A= > - =0A= > -=0A= > - =0A= > - AuthenticationFilter=0A= > - /*=0A= > - =0A= > -=0A= > - =0A= > - BasicAuthenticationFilter=0A= > - /*=0A= > - =0A= > -=0A= > - =0A= > - =0A= > -=0A= > - =0A= > - STSClientFilterRequestor=0A= > - /*=0A= > - =0A= > -=0A= > - =0A= > - STSClientFilterRequestor=0A= > -=0A= > - /*=0A= > - =0A= > -=0A= > - =0A= > - STSClientFilterRP=0A= > - /*=0A= > - =0A= > -=0A= > - =0A= > - FederationPostFilter=0A= > - /*=0A= > - =0A= > -=0A= > - =0A= > - LogoutFilter=0A= > - /*=0A= > - =0A= > -=0A= > - =0A= > - SessionCacheFilter=0A= > - /*=0A= > - =0A= > -=0A= > -=0A= > - =0A= > - contextConfigLocation=0A= > - WEB-INF/applicationContext.xml= =0A= > - =0A= > - =0A= > -=0A= > org.springframework.web.context.ContextLoaderListener=0A= > - =0A= > -=0A= > -=0A= > -=0A= > + http://www.w3.org/2001/XMLSchema-instance"=0A= > + xsi:schemaLocation=3D"http://java.sun.com/xml/ns/javaee=0A= > + http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"= =0A= > + version=3D"3.0" metadata-complete=3D"true">=0A= > +=0A= > + Fediz IDP=0A= > + Fediz IDP=0A= > +=0A= > + =0A= > + contextConfigLocation=0A= > + /WEB-INF/applicationContext.xml=0A= > + =0A= > +=0A= > + =0A= > + idp=0A= > + =0A= > + org.springframework.web.servlet.DispatcherServlet= =0A= > + =0A= > + =0A= > + publishContext=0A= > + false=0A= > + =0A= > + 1=0A= > + =0A= > +=0A= > + =0A= > + idp=0A= > + /federation=0A= > + =0A= > +=0A= > + =0A= > +=0A= > org.springframework.web.context.ContextLoaderListener=0A= > + =0A= > +=0A= > +=0A= > +=0A= >=0A= > Modified: cxf/fediz/trunk/services/sts/pom.xml=0A= > URL:=0A= > http://svn.apache.org/viewvc/cxf/fediz/trunk/services/sts/pom.xml?rev=3D1= 462277&r1=3D1462276&r2=3D1462277&view=3Ddiff=0A= >=0A= > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=0A= > --- cxf/fediz/trunk/services/sts/pom.xml (original)=0A= > +++ cxf/fediz/trunk/services/sts/pom.xml Thu Mar 28 19:53:35 2013=0A= > @@ -68,8 +68,29 @@=0A= > =0A= > =0A= > -->=0A= > + =0A= > + =0A= > + org.slf4j=0A= > + slf4j-api=0A= > + ${slf4j.version}=0A= > + compile=0A= > =0A= > - =0A= > + =0A= > + org.slf4j=0A= > + slf4j-jdk14=0A= > + ${slf4j.version}=0A= > + runtime=0A= > + =0A= > +=0A= > + =0A= > +=0A= > =0A= > =0A= >