Author: sguilhen(a)redhat.com Date: 2009-11-19 20:36:17 -0500 (Thu, 19 Nov 2009) New Revision: 1054 Modified: migration/picketlink/federation/trunk/picketlink-fed-api/src/test/java/org/picketlink/test/identity/federation/api/wstrust/WSTrustClientUnitTestCase.java migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/plugins/saml/SAML20TokenProvider.java migration/picketlink/federation/trunk/picketlink-webapps/picketlink-sts/src/main/resources/picketlink-sts.xml migration/picketlink/federation/trunk/picketlink-webapps/picketlink-sts/src/main/webapp/WEB-INF/wsdl/PicketLinkSTS.wsdl Log: Fixes to make WSTrustClientUnitTestCase pass Modified: migration/picketlink/federation/trunk/picketlink-fed-api/src/test/java/org/picketlink/test/identity/federation/api/wstrust/WSTrustClientUnitTestCase.java =================================================================== --- migration/picketlink/federation/trunk/picketlink-fed-api/src/test/java/org/picketlink/test/identity/federation/api/wstrust/WSTrustClientUnitTestCase.java 2009-11-19 22:34:45 UTC (rev 1053) +++ migration/picketlink/federation/trunk/picketlink-fed-api/src/test/java/org/picketlink/test/identity/federation/api/wstrust/WSTrustClientUnitTestCase.java 2009-11-20 01:36:17 UTC (rev 1054) @@ -189,7 +189,7 @@ String serviceName = "PicketLinkSTS"; String portName = "PicketLinkSTSPort"; - String endpointAddress = "http://localhost:8080/jboss-sts/PicketLinkSTS"; + String endpointAddress = "http://localhost:8080/picketlink-sts/PicketLinkSTS"; WSTrustClient client = new WSTrustClient(serviceName, portName, endpointAddress, new SecurityInfo("admin", "admin") ); Element token = client.issueToken(SAMLUtil.SAML2_TOKEN_TYPE); assertTrue("Token is valid" , client.validateToken(token)); @@ -202,10 +202,10 @@ private Dispatch<Source> createDispatch() throws MalformedURLException, JAXBException { // JBoss STS target information. - String targetNS = "http://org.picketlink.trust/sts/"; + String targetNS = "urn:picketlink:identity-federation:sts"; QName serviceName = new QName(targetNS, "PicketLinkSTS"); QName portName = new QName(targetNS, "PicketLinkSTSPort"); - URL endpointAddress = new URL("http://localhost:8080/jboss-sts/PicketLinkSTS"); + URL endpointAddress = new URL("http://localhost:8080/picketlink-sts/PicketLinkSTS"); // URL securityConfigURL = new File("jboss-wsse-client.xml").toURI().toURL(); Service service = Service.create(serviceName); Modified: migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/plugins/saml/SAML20TokenProvider.java =================================================================== --- migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/plugins/saml/SAML20TokenProvider.java 2009-11-19 22:34:45 UTC (rev 1053) +++ migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/plugins/saml/SAML20TokenProvider.java 2009-11-20 01:36:17 UTC (rev 1054) @@ -101,7 +101,7 @@ String file = this.properties.get(CANCELED_IDS_FILE); if (file == null && logger.isDebugEnabled()) logger.debug("File to store canceled ids has not been specified: ids will not be persisted!"); - else + else if (file != null) { this.canceledIdsFile = new File(file); this.loadCanceledIds(); Modified: migration/picketlink/federation/trunk/picketlink-webapps/picketlink-sts/src/main/resources/picketlink-sts.xml =================================================================== --- migration/picketlink/federation/trunk/picketlink-webapps/picketlink-sts/src/main/resources/picketlink-sts.xml 2009-11-19 22:34:45 UTC (rev 1053) +++ migration/picketlink/federation/trunk/picketlink-webapps/picketlink-sts/src/main/resources/picketlink-sts.xml 2009-11-20 01:36:17 UTC (rev 1054) @@ -1,5 +1,5 @@ -<JBossSTS xmlns="urn:jboss:identity-federation:config:1.0" - STSName="JBossSTS" TokenTimeout="7200" EncryptToken="true"> +<PicketLinkSTS xmlns="urn:picketlink:identity-federation:config:1.0" + STSName="PicketLinkSTS" TokenTimeout="7200" EncryptToken="false"> <KeyProvider ClassName="org.picketlink.identity.federation.core.impl.KeyStoreKeyManager"> <Auth Key="KeyStoreURL" Value="sts_keystore.jks"/> <Auth Key="KeyStorePass" Value="testpass"/> @@ -8,13 +8,13 @@ <ValidatingAlias Key="http://services.testcorp.org/provider1" Value="service1"/> </KeyProvider> <TokenProviders> - <TokenProvider ProviderClass="org.picketlink.identity.federation.core.wstrust.plugins.saml.SAML20TokenProvider" - TokenType="http://docs.oasis-open.org/wss/oasis-wss-saml-token-profi... - TokenElement="Assertion" -TokenElementNS="urn:oasis:names:tc:SAML:2.0:assertion"/> + <TokenProvider ProviderClass="org.picketlink.identity.federation.core.wstrust.plugins.saml.SAML20TokenProvider" + TokenType="http://docs.oasis-open.org/wss/oasis-wss-saml-token-profi... + TokenElement="Assertion" + TokenElementNS="urn:oasis:names:tc:SAML:2.0:assertion"/> </TokenProviders> <ServiceProviders> <ServiceProvider Endpoint="http://services.testcorp.org/provider1" TokenType="http://docs.oasis-open.org/wss/oasis-wss-saml-token-profi... TruststoreAlias="service1"/> </ServiceProviders> -</JBossSTS> +</PicketLinkSTS> Modified: migration/picketlink/federation/trunk/picketlink-webapps/picketlink-sts/src/main/webapp/WEB-INF/wsdl/PicketLinkSTS.wsdl =================================================================== --- migration/picketlink/federation/trunk/picketlink-webapps/picketlink-sts/src/main/webapp/WEB-INF/wsdl/PicketLinkSTS.wsdl 2009-11-19 22:34:45 UTC (rev 1053) +++ migration/picketlink/federation/trunk/picketlink-webapps/picketlink-sts/src/main/webapp/WEB-INF/wsdl/PicketLinkSTS.wsdl 2009-11-20 01:36:17 UTC (rev 1054) @@ -1,12 +1,15 @@ <?xml version="1.0"?> -<wsdl:definitions name="JBossSTS" targetNamespace="urn:picketlink:identity-federation:sts" +<wsdl:definitions name="PicketLinkSTS" targetNamespace="urn:picketlink:identity-federation:sts" xmlns:tns="urn:picketlink:identity-federation:sts" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsap10="http://www.w3.org/2006/05/addressing/wsdl" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/"> <wsdl:types> - <xs:schema version="1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema"> + <xs:schema targetNamespace="urn:picketlink:identity-federation:sts" + xmlns:tns="urn:picketlink:identity-federation:sts" + xmlns:xs="http://www.w3.org/2001/XMLSchema" + version="1.0"> <xs:complexType name="MessageBody"> <xs:sequence> <xs:any minOccurs="0" maxOccurs="unbounded" namespace="##any"/>