Author: sguilhen(a)redhat.com Date: 2009-11-18 16:34:30 -0500 (Wed, 18 Nov 2009) New Revision: 1030 Modified: migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/PicketLinkSTS.java migration/picketlink/federation/trunk/picketlink-webapps/picketlink-sts/src/main/webapp/WEB-INF/web.xml migration/picketlink/federation/trunk/picketlink-webapps/picketlink-sts/src/main/webapp/WEB-INF/wsdl/PicketLinkSTS.wsdl Log: Updated STS targetNamespace Modified: migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/PicketLinkSTS.java =================================================================== --- migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/PicketLinkSTS.java 2009-11-18 21:26:59 UTC (rev 1029) +++ migration/picketlink/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/PicketLinkSTS.java 2009-11-18 21:34:30 UTC (rev 1030) @@ -55,7 +55,7 @@ * @author <a href="mailto:sguilhen@redhat.com">Stefan Guilhen</a> */ @WebServiceProvider(serviceName = "PicketLinkSTS", portName = "PicketLinkSTSPort", - targetNamespace = "http://org.picketlink.trust/sts", + targetNamespace = "urn:picketlink:identity-federation:sts", wsdlLocation = "WEB-INF/wsdl/PicketLinkSTS.wsdl") @ServiceMode(value = Service.Mode.PAYLOAD) public class PicketLinkSTS implements SecurityTokenService @@ -200,7 +200,7 @@ URL configurationFile = SecurityActions.getContextClassLoader().getResource(STS_CONFIG_FILE); if (configurationFile == null) { - logger.warn("jboss-sts.xml configuration file not found. Using default configuration values"); + logger.warn("picketlink-sts.xml configuration file not found. Using default configuration values"); return new PicketLinkSTSConfiguration(); } @@ -212,7 +212,7 @@ STSType stsConfig = element.getValue(); STSConfiguration configuration = new PicketLinkSTSConfiguration(stsConfig); if(logger.isInfoEnabled()) - logger.info("jboss-sts.xml configuration file loaded"); + logger.info("picketlink-sts.xml configuration file loaded"); return configuration; } catch (Exception e) Modified: migration/picketlink/federation/trunk/picketlink-webapps/picketlink-sts/src/main/webapp/WEB-INF/web.xml =================================================================== --- migration/picketlink/federation/trunk/picketlink-webapps/picketlink-sts/src/main/webapp/WEB-INF/web.xml 2009-11-18 21:26:59 UTC (rev 1029) +++ migration/picketlink/federation/trunk/picketlink-webapps/picketlink-sts/src/main/webapp/WEB-INF/web.xml 2009-11-18 21:34:30 UTC (rev 1030) @@ -5,11 +5,11 @@ <web-app> <servlet> - <servlet-name>JBossSTS</servlet-name> - <servlet-class>org.picketlink.identity.federation.core.wstrust.JBossSTS</servlet-class> + <servlet-name>PicketLinkSTS</servlet-name> + <servlet-class>org.picketlink.identity.federation.core.wstrust.PicketLinkSTS</servlet-class> </servlet> <servlet-mapping> - <servlet-name>JBossSTS</servlet-name> + <servlet-name>PicketLinkSTS</servlet-name> <url-pattern>/*</url-pattern> </servlet-mapping> @@ -27,7 +27,7 @@ <login-config> <auth-method>BASIC</auth-method> - <realm-name>JBossSTSRealm</realm-name> + <realm-name>PicketLinkSTSRealm</realm-name> </login-config> <security-role> 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-18 21:26:59 UTC (rev 1029) +++ migration/picketlink/federation/trunk/picketlink-webapps/picketlink-sts/src/main/webapp/WEB-INF/wsdl/PicketLinkSTS.wsdl 2009-11-18 21:34:30 UTC (rev 1030) @@ -1,12 +1,12 @@ <?xml version="1.0"?> -<wsdl:definitions name="JBossSTS" targetNamespace="http://org.jboss.identity.trust/sts" - xmlns:tns="http://org.jboss.identity.trust/sts" +<wsdl:definitions name="JBossSTS" 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 targetNamespace="http://org.jboss.identity.trust/sts" xmlns:tns="http://org.jboss.identity.trust/sts" version="1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema"> + <xs:schema version="1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema"> <xs:complexType name="MessageBody"> <xs:sequence> <xs:any minOccurs="0" maxOccurs="unbounded" namespace="##any"/> @@ -38,9 +38,9 @@ </wsdl:output> </wsdl:operation> </wsdl:binding> - <wsdl:service name="JBossSTS"> - <wsdl:port name="JBossSTSPort" binding="tns:STSBinding"> - <soap12:address location="http://localhost:8080/jboss-sts"/> + <wsdl:service name="PicketLinkSTS"> + <wsdl:port name="PicketLinkSTSPort" binding="tns:STSBinding"> + <soap12:address location="http://localhost:8080/picketlink-sts"/> </wsdl:port> </wsdl:service> </wsdl:definitions>