[jboss-svn-commits] JBL Code SVN: r30306 - in labs/jbossesb/branches/JBESB_4_7_CP/product: install and 8 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Mon Nov 23 04:51:17 EST 2009


Author: beve
Date: 2009-11-23 04:51:16 -0500 (Mon, 23 Nov 2009)
New Revision: 30306

Added:
   labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/security_saml/picketlink-sts-client.properties
   labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/security_saml/picketlink-sts.properties
   labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/security_saml/picketlink-sts.war
Removed:
   labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/security_saml/jboss-sts-client.properties
   labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/security_saml/jboss-sts.properties
   labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/security_saml/jboss-sts.war
Modified:
   labs/jbossesb/branches/JBESB_4_7_CP/product/.classpath
   labs/jbossesb/branches/JBESB_4_7_CP/product/install/build.xml
   labs/jbossesb/branches/JBESB_4_7_CP/product/ivy.xml
   labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/src/org/jboss/soa/esb/services/security/auth/login/JBossSTSTokenCallbackHandler.java
   labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/src/org/jboss/soa/esb/services/security/auth/login/SamlContext.java
   labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/src/org/jboss/soa/esb/services/security/auth/ws/SamlAssertionExtractor.java
   labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/src/org/jboss/soa/esb/services/security/auth/ws/SamlSoapAssertionExtractor.java
   labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/src/org/jboss/soa/esb/services/security/auth/ws/SamlVisitor.java
   labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/ws/SamlSoapAssertionExtractorUnitTest.java
   labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/ws/SamlVisitorUnitTest.java
   labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/security_saml/build.xml
   labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/security_saml/login-config.xml
   labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/security_saml/readme.txt
   labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/security_saml/src/org/jboss/soa/esb/samples/quickstart/securitysaml/webservice/handlerchain.xml
   labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/security_saml/war/resources/WEB-INF/web.xml
   labs/jbossesb/branches/JBESB_4_7_CP/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/SOAPSamlHandler.java
   labs/jbossesb/branches/JBESB_4_7_CP/product/services/soap/src/test/java/org/jboss/soa/esb/actions/soap/SOAPSamlHandlerUnitTest.java
Log:
Work for https://jira.jboss.org/jira/browse/JBESB-2987 "Upgrade JBoss-Identity to 1.0.0.CR1"


Modified: labs/jbossesb/branches/JBESB_4_7_CP/product/.classpath
===================================================================
--- labs/jbossesb/branches/JBESB_4_7_CP/product/.classpath	2009-11-23 09:27:14 UTC (rev 30305)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/.classpath	2009-11-23 09:51:16 UTC (rev 30306)
@@ -70,8 +70,8 @@
 	<classpathentry kind="lib" path="build/lib/jboss-deployers-structure-spi-2.0.7.GA.jar"/>
 	<classpathentry kind="lib" path="build/lib/jboss-deployers-vfs-2.0.7.GA.jar"/>
 	<classpathentry kind="lib" path="build/lib/jboss-deployers-vfs-spi-2.0.7.GA.jar"/>
-	<classpathentry kind="lib" path="build/lib/jboss-identity-fed-api-1.0.0.beta3.jar"/>
-	<classpathentry kind="lib" path="build/lib/jboss-identity-fed-core-1.0.0.beta3.jar"/>
+	<classpathentry kind="lib" path="build/lib/picketlink-identity-fed-api-1.0.0.CR1.jar"/>
+	<classpathentry kind="lib" path="build/lib/picketlink-identity-fed-core-1.0.0.CR1.jar"/>
 	<classpathentry kind="lib" path="build/lib/jboss-kernel-2.0.6.GA.jar"/>
 	<classpathentry kind="lib" path="build/lib/jboss-managed-2.1.0.SP1.jar"/>
 	<classpathentry kind="lib" path="build/lib/jboss-mdr-2.0.1.GA.jar"/>

Modified: labs/jbossesb/branches/JBESB_4_7_CP/product/install/build.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_7_CP/product/install/build.xml	2009-11-23 09:27:14 UTC (rev 30305)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/install/build.xml	2009-11-23 09:51:16 UTC (rev 30306)
@@ -226,7 +226,7 @@
 	        <!-- copy JBoss Identity jars -->
                 <copy todir="${server.lib.dir}" overwrite="true">
 	            <fileset dir="${org.jboss.esb.dist.lib}">
-	                <include name="jboss-identity-*.jar"/>
+	                <include name="picketlink-*.jar"/>
 	            </fileset>
 	        </copy>
 		
@@ -299,7 +299,7 @@
 		
         <copy todir="${server.lib.dir}" overwrite="true">
             <fileset dir="${org.jboss.esb.dist.lib}">
-                <include name="jboss-identity-*.jar"/>
+                <include name="picketlink-*.jar"/>
                 <include name="commons-httpclient-*.jar"/>
             </fileset>
         </copy>
@@ -425,7 +425,7 @@
         <delete dir="${conf.dir}/action-templates.xml" quiet="true"/>
         <delete quiet="false">
 			<fileset dir="${server.lib.dir}" >
-                <include name="jboss-identity-*.jar"/>
+                <include name="picketlink-*.jar"/>
             </fileset>
         </delete>
     </target>

Modified: labs/jbossesb/branches/JBESB_4_7_CP/product/ivy.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_7_CP/product/ivy.xml	2009-11-23 09:27:14 UTC (rev 30305)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/ivy.xml	2009-11-23 09:51:16 UTC (rev 30306)
@@ -154,13 +154,13 @@
         <dependency org="jboss" name="jbosssx" rev="4.2.3.GA"/>
 
 		<!-- JBoss Identity Federation -->
-        <dependency org="org.jboss.identity" name="jboss-identity-fed-api" rev="1.0.0.beta3"/>
-        <dependency org="org.jboss.identity" name="jboss-identity-fed-core" rev="1.0.0.beta3"/>
-        <dependency org="org.jboss.identity" name="jboss-identity-fed-model" rev="1.0.0.beta3"/>
-        <dependency org="org.jboss.identity" name="jboss-identity-xmlsec-model" rev="1.0.0.beta3"/>
-        <dependency org="org.jboss.identity" name="jboss-identity-bindings" rev="1.0.0.beta3"/>
-        <dependency org="org.jboss.identity" name="jboss-identity-bindings-jboss" rev="1.0.0.beta3"/>
-        <dependency org="org.jboss.identity" name="jboss-identity-web" rev="1.0.0.beta3"/>
+        <dependency org="org.picketlink" name="picketlink-fed-api" rev="1.0.0.CR1"/>
+        <dependency org="org.picketlink" name="picketlink-fed-core" rev="1.0.0.CR1"/>
+        <dependency org="org.picketlink" name="picketlink-fed-model" rev="1.0.0.CR1"/>
+        <dependency org="org.picketlink" name="picketlink-xmlsec-model" rev="1.0.0.CR1"/>
+        <dependency org="org.picketlink" name="picketlink-bindings" rev="1.0.0.CR1"/>
+        <dependency org="org.picketlink" name="picketlink-bindings-jboss" rev="1.0.0.CR1"/>
+        <dependency org="org.picketlink" name="picketlink-web" rev="1.0.0.CR1"/>
         <dependency org="org.apache" name="xmlsec" rev="1.4.3"/>
 
 	<!-- JOPR dependencies -->

Modified: labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/src/org/jboss/soa/esb/services/security/auth/login/JBossSTSTokenCallbackHandler.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/src/org/jboss/soa/esb/services/security/auth/login/JBossSTSTokenCallbackHandler.java	2009-11-23 09:27:14 UTC (rev 30305)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/src/org/jboss/soa/esb/services/security/auth/login/JBossSTSTokenCallbackHandler.java	2009-11-23 09:51:16 UTC (rev 30306)
@@ -24,9 +24,9 @@
 import javax.security.auth.callback.Callback;
 import javax.security.auth.callback.UnsupportedCallbackException;
 import org.apache.log4j.Logger;
-import org.jboss.identity.federation.core.exceptions.ProcessingException;
-import org.jboss.identity.federation.core.wstrust.SamlCredential;
-import org.jboss.identity.federation.core.wstrust.auth.TokenCallback;
+import org.picketlink.identity.federation.core.exceptions.ProcessingException;
+import org.picketlink.identity.federation.core.wstrust.SamlCredential;
+import org.picketlink.identity.federation.core.wstrust.auth.TokenCallback;
 import org.jboss.internal.soa.esb.services.security.EsbCallbackHandler;
 import org.jboss.soa.esb.services.security.SecurityConfig;
 import org.jboss.soa.esb.services.security.auth.AuthenticationRequest;

Modified: labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/src/org/jboss/soa/esb/services/security/auth/login/SamlContext.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/src/org/jboss/soa/esb/services/security/auth/login/SamlContext.java	2009-11-23 09:27:14 UTC (rev 30305)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/src/org/jboss/soa/esb/services/security/auth/login/SamlContext.java	2009-11-23 09:51:16 UTC (rev 30306)
@@ -26,7 +26,7 @@
 
 import javax.security.auth.Subject;
 
-import org.jboss.identity.federation.core.wstrust.SamlCredential;
+import org.picketlink.identity.federation.core.wstrust.SamlCredential;
 
 /**
  * SamlContext provides a way to retreive a SamlCredential or Set

Modified: labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/src/org/jboss/soa/esb/services/security/auth/ws/SamlAssertionExtractor.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/src/org/jboss/soa/esb/services/security/auth/ws/SamlAssertionExtractor.java	2009-11-23 09:27:14 UTC (rev 30305)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/src/org/jboss/soa/esb/services/security/auth/ws/SamlAssertionExtractor.java	2009-11-23 09:51:16 UTC (rev 30306)
@@ -28,7 +28,7 @@
 
 import javax.xml.transform.stream.StreamSource;
 
-import org.jboss.identity.federation.core.wstrust.SamlCredential;
+import org.picketlink.identity.federation.core.wstrust.SamlCredential;
 import org.jboss.soa.esb.lifecycle.LifecycleResourceException;
 import org.jboss.soa.esb.services.security.auth.AuthenticationRequest;
 import org.jboss.soa.esb.services.security.auth.AuthenticationRequestImpl;

Modified: labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/src/org/jboss/soa/esb/services/security/auth/ws/SamlSoapAssertionExtractor.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/src/org/jboss/soa/esb/services/security/auth/ws/SamlSoapAssertionExtractor.java	2009-11-23 09:27:14 UTC (rev 30305)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/src/org/jboss/soa/esb/services/security/auth/ws/SamlSoapAssertionExtractor.java	2009-11-23 09:51:16 UTC (rev 30306)
@@ -29,7 +29,7 @@
 import javax.xml.soap.SOAPMessage;
 
 import org.apache.log4j.Logger;
-import org.jboss.identity.federation.core.wstrust.SamlCredential;
+import org.picketlink.identity.federation.core.wstrust.SamlCredential;
 import org.jboss.soa.esb.services.security.auth.AuthenticationRequest;
 import org.jboss.soa.esb.services.security.auth.AuthenticationRequestImpl;
 import org.jboss.soa.esb.services.security.auth.SecurityInfoExtractor;

Modified: labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/src/org/jboss/soa/esb/services/security/auth/ws/SamlVisitor.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/src/org/jboss/soa/esb/services/security/auth/ws/SamlVisitor.java	2009-11-23 09:27:14 UTC (rev 30305)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/src/org/jboss/soa/esb/services/security/auth/ws/SamlVisitor.java	2009-11-23 09:51:16 UTC (rev 30306)
@@ -20,7 +20,7 @@
  */
 package org.jboss.soa.esb.services.security.auth.ws;
 
-import org.jboss.identity.federation.core.wstrust.SamlCredential;
+import org.picketlink.identity.federation.core.wstrust.SamlCredential;
 import org.jboss.soa.esb.services.security.auth.login.SamlContext;
 
 

Modified: labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/ws/SamlSoapAssertionExtractorUnitTest.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/ws/SamlSoapAssertionExtractorUnitTest.java	2009-11-23 09:27:14 UTC (rev 30305)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/ws/SamlSoapAssertionExtractorUnitTest.java	2009-11-23 09:51:16 UTC (rev 30306)
@@ -32,7 +32,7 @@
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.soap.SOAPMessage;
 
-import org.jboss.identity.federation.core.wstrust.SamlCredential;
+import org.picketlink.identity.federation.core.wstrust.SamlCredential;
 import org.jboss.internal.soa.esb.util.StreamUtils;
 import org.jboss.internal.soa.esb.util.XMLHelper;
 import org.jboss.soa.esb.ConfigurationException;

Modified: labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/ws/SamlVisitorUnitTest.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/ws/SamlVisitorUnitTest.java	2009-11-23 09:27:14 UTC (rev 30305)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/ws/SamlVisitorUnitTest.java	2009-11-23 09:51:16 UTC (rev 30306)
@@ -28,7 +28,7 @@
 
 import junit.framework.JUnit4TestAdapter;
 
-import org.jboss.identity.federation.core.wstrust.SamlCredential;
+import org.picketlink.identity.federation.core.wstrust.SamlCredential;
 import org.jboss.internal.soa.esb.util.StreamUtils;
 import org.jboss.internal.soa.esb.util.XMLHelper;
 import org.junit.Test;

Modified: labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/security_saml/build.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/security_saml/build.xml	2009-11-23 09:27:14 UTC (rev 30305)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/security_saml/build.xml	2009-11-23 09:51:16 UTC (rev 30306)
@@ -6,16 +6,16 @@
 	</description>
 
 	<!-- additional deploys -->
-    <property name="additional.deploys" value="jboss-wsse-client.xml, smooks/*.xml, jboss-sts-client.properties"/>
+    <property name="additional.deploys" value="jboss-wsse-client.xml, smooks/*.xml, picketlink-sts-client.properties"/>
 
 	<target name="quickstart-specific-checks" depends="assert-ws-available, assert-as5"/>
 
 	<target name="quickstart-specific-predeploys">
-		<copy file="${basedir}/jboss-sts.war" todir="${org.jboss.esb.server.deploy.dir}"/>
+		<copy file="${basedir}/picketlink-sts.war" todir="${org.jboss.esb.server.deploy.dir}"/>
     </target>
 
 	 <target name="quickstart-specific-undeploys">
-		<delete file="${org.jboss.esb.server.deploy.dir}/jboss-sts.war"/>
+		<delete file="${org.jboss.esb.server.deploy.dir}/picketlink-sts.war"/>
     </target>
 			
 	<!-- Import the base Ant build script... -->
@@ -59,7 +59,7 @@
 			<filterset>
 				<filter token="KEYSTORE_PATH" value="${basedir}/keystore"/>
 				<filter token="ROLES_FILE_PATH" value="${basedir}/roles.properties"/>
-				<filter token="STS_CONFIG_FILE_PATH" value="${basedir}/jboss-sts-client.properties"/>
+				<filter token="STS_CONFIG_FILE_PATH" value="${basedir}/picketlink-sts-client.properties"/>
 			</filterset>
             <fileset dir="${basedir}">
                 <include name="login-config.xml"/>

Deleted: labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/security_saml/jboss-sts-client.properties
===================================================================
--- labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/security_saml/jboss-sts-client.properties	2009-11-23 09:27:14 UTC (rev 30305)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/security_saml/jboss-sts-client.properties	2009-11-23 09:51:16 UTC (rev 30306)
@@ -1,5 +0,0 @@
-serviceName=JBossSTS
-portName=JBossSTSPort
-endpointAddress=http://localhost:8080/jboss-sts/JBossSTS
-username=admin
-password=admin

Deleted: labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/security_saml/jboss-sts.properties
===================================================================
--- labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/security_saml/jboss-sts.properties	2009-11-23 09:27:14 UTC (rev 30305)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/security_saml/jboss-sts.properties	2009-11-23 09:51:16 UTC (rev 30306)
@@ -1,5 +0,0 @@
-serviceName=JBossSTS
-portName=JBossSTSPort
-endpointAddress=http://localhost:8080/jboss-sts/JBossSTS
-username=admin
-password=admin

Deleted: labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/security_saml/jboss-sts.war
===================================================================
(Binary files differ)

Modified: labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/security_saml/login-config.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/security_saml/login-config.xml	2009-11-23 09:27:14 UTC (rev 30305)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/security_saml/login-config.xml	2009-11-23 09:51:16 UTC (rev 30306)
@@ -1,20 +1,23 @@
 
 	<application-policy name="saml-issue-token">
         <authentication>
-            <login-module code="org.jboss.identity.federation.core.wstrust.auth.STSIssuingLoginModule" flag="required">
+            <login-module code="org.picketlink.identity.federation.core.wstrust.auth.STSIssuingLoginModule" flag="required">
                 <module-option name="configFile">@STS_CONFIG_FILE_PATH@</module-option>
                 <module-option name="endpointURI">http://security_saml/goodbyeworld</module-option>
+                <module-option name="password-stacking">true</module-option>
             </login-module>
-            <login-module code="org.jboss.identity.federation.core.wstrust.auth.STSValidatingLoginModule" flag="required">
+            <login-module code="org.picketlink.identity.federation.core.wstrust.auth.STSValidatingLoginModule" flag="required">
                 <module-option name="configFile">@STS_CONFIG_FILE_PATH@</module-option>
+                <module-option name="password-stacking">useFirstPass</module-option>
             </login-module>
         </authentication>
     </application-policy>
 
-	<application-policy name="saml-validate-token">
+    <application-policy name="saml-validate-token">
         <authentication>
-            <login-module code="org.jboss.identity.federation.core.wstrust.auth.STSValidatingLoginModule" flag="required">
+            <login-module code="org.picketlink.identity.federation.core.wstrust.auth.STSValidatingLoginModule" flag="required">
                 <module-option name="configFile">@STS_CONFIG_FILE_PATH@</module-option>
+                <module-option name="useOptionsCredentials">true</module-option>
             </login-module>
         </authentication>
     </application-policy>

Copied: labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/security_saml/picketlink-sts-client.properties (from rev 30276, labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/security_saml/jboss-sts-client.properties)
===================================================================
--- labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/security_saml/picketlink-sts-client.properties	                        (rev 0)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/security_saml/picketlink-sts-client.properties	2009-11-23 09:51:16 UTC (rev 30306)
@@ -0,0 +1,5 @@
+serviceName=PicketLinkSTS
+portName=PicketLinkSTSPort
+endpointAddress=http://localhost:8080/picketlink-sts/PicketLinkSTS
+username=admin
+password=admin

Copied: labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/security_saml/picketlink-sts.properties (from rev 30276, labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/security_saml/jboss-sts.properties)
===================================================================
--- labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/security_saml/picketlink-sts.properties	                        (rev 0)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/security_saml/picketlink-sts.properties	2009-11-23 09:51:16 UTC (rev 30306)
@@ -0,0 +1,5 @@
+serviceName=PicketLinkSTS
+portName=PicketLinkSTSPort
+endpointAddress=http://localhost:8080/picketlink-sts/JBossSTS
+username=admin
+password=admin

Added: labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/security_saml/picketlink-sts.war
===================================================================
(Binary files differ)


Property changes on: labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/security_saml/picketlink-sts.war
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/security_saml/readme.txt
===================================================================
--- labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/security_saml/readme.txt	2009-11-23 09:27:14 UTC (rev 30305)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/security_saml/readme.txt	2009-11-23 09:51:16 UTC (rev 30306)
@@ -1,13 +1,13 @@
 Overview:
 =========
   This quickstart demonstrates JBossESB support for SAML. SAML support is provided by 
-  using JBoss Security Token Service (JBossSTS) from the JBoss Identity Project.
+  using the PicketLink project's Security Token Service (PicketLinkSTS).
 
   The following will be demonstrated by this quickstart:
-  * Using the JBoss Identity Project's STSIssuingLoginModule to isssue a SAML Assertion from JBossSTS.
-  * Using the JBoss Identity Project's STSValidatingLoginModule to validate a SAML Assertion from JBossSTS.
+  * Using the PicketLink Project's STSIssuingLoginModule to isssue a SAML Assertion from PicketLinkSTS.
+  * Using the PicketLink Project's STSValidatingLoginModule to validate a SAML Assertion from PicketLinkSTS.
   * Injecting the SAML Assertion into a SOAP Message.
-  * Using SOAPProcessor to invoke an externa Web Service that is secured by JBossSTS.
+  * Using SOAPProcessor to invoke an externa Web Service that is secured by PicketLinkSTS.
 
   (Note that this quickstart only works with AS 5.1.0.GA or higher)
 
@@ -24,14 +24,14 @@
   4. 'ant runtest' will send a HTTP request to a JBossRemoting Gatway
 
   # Please refer to the "Security" section of the ServiceGuide.pdf for more details on the security features of JBossESB.
+	and http://www.jboss.org/community/wiki/JBossESBSAMLSupport for SAML specific information.
 
-
 Quickstart content
 ==================
 # jboss-sts.war
-The JBossSTS.war is the JBoss Identity WS-Trust Security Token Service implementation.
+The PicketLinkSTS.war is the PicketLink WS-Trust Security Token Service implementation.
 
-# jboss-sts-client.properties
+# picketlink-sts-client.properties
 The configuration for the both STSIssuingLoginModule and STSValidatingLoginModule.
 Note that the username and password in this file is only used by the STSValidatingLoginModule. 
 The STSIssuingLoginModule uses callbacks to retreive the username and password from the authentication 

Modified: labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/security_saml/src/org/jboss/soa/esb/samples/quickstart/securitysaml/webservice/handlerchain.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/security_saml/src/org/jboss/soa/esb/samples/quickstart/securitysaml/webservice/handlerchain.xml	2009-11-23 09:27:14 UTC (rev 30305)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/security_saml/src/org/jboss/soa/esb/samples/quickstart/securitysaml/webservice/handlerchain.xml	2009-11-23 09:51:16 UTC (rev 30306)
@@ -3,7 +3,7 @@
 	<jws:handler-chains>
 		<jws:handler-chain>
 			<jws:handler>
-				<jws:handler-class>org.jboss.identity.federation.core.wstrust.handlers.STSSaml20Handler</jws:handler-class>
+				<jws:handler-class>org.picketlink.identity.federation.core.wstrust.handlers.STSSaml20Handler</jws:handler-class>
 			</jws:handler>
 		</jws:handler-chain>
 	</jws:handler-chains>

Modified: labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/security_saml/war/resources/WEB-INF/web.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/security_saml/war/resources/WEB-INF/web.xml	2009-11-23 09:27:14 UTC (rev 30305)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/security_saml/war/resources/WEB-INF/web.xml	2009-11-23 09:51:16 UTC (rev 30306)
@@ -18,7 +18,7 @@
 	<env-entry>
 		<env-entry-name>STSClientConfig</env-entry-name>
 		<env-entry-type>java.lang.String</env-entry-type>
-		<env-entry-value>/jboss-sts-client.properties</env-entry-value>
+		<env-entry-value>/picketlink-sts-client.properties</env-entry-value>
 	</env-entry>
 
 </web-app>

Modified: labs/jbossesb/branches/JBESB_4_7_CP/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/SOAPSamlHandler.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_7_CP/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/SOAPSamlHandler.java	2009-11-23 09:27:14 UTC (rev 30305)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/SOAPSamlHandler.java	2009-11-23 09:51:16 UTC (rev 30306)
@@ -29,8 +29,8 @@
 import javax.xml.ws.handler.soap.SOAPHandler;
 import javax.xml.ws.handler.soap.SOAPMessageContext;
 
-import org.jboss.identity.federation.core.exceptions.ProcessingException;
-import org.jboss.identity.federation.core.wstrust.SamlCredential;
+import org.picketlink.identity.federation.core.exceptions.ProcessingException;
+import org.picketlink.identity.federation.core.wstrust.SamlCredential;
 import org.jboss.soa.esb.services.security.auth.login.SamlContext;
 import org.w3c.dom.Element;
 

Modified: labs/jbossesb/branches/JBESB_4_7_CP/product/services/soap/src/test/java/org/jboss/soa/esb/actions/soap/SOAPSamlHandlerUnitTest.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_7_CP/product/services/soap/src/test/java/org/jboss/soa/esb/actions/soap/SOAPSamlHandlerUnitTest.java	2009-11-23 09:27:14 UTC (rev 30305)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/services/soap/src/test/java/org/jboss/soa/esb/actions/soap/SOAPSamlHandlerUnitTest.java	2009-11-23 09:51:16 UTC (rev 30306)
@@ -36,7 +36,7 @@
 
 import junit.framework.JUnit4TestAdapter;
 
-import org.jboss.identity.federation.core.wstrust.SamlCredential;
+import org.picketlink.identity.federation.core.wstrust.SamlCredential;
 import org.jboss.internal.soa.esb.util.StreamUtils;
 import org.jboss.internal.soa.esb.util.XMLHelper;
 import org.junit.Test;



More information about the jboss-svn-commits mailing list