[Carbon-commits] [Carbon] svn commit r114709 - trunk/carbon/orbit/rampart-trust/src/main/resources/META-INF

[hasini at wso2.com]

Author: hasini
Date: Sat Oct 22 03:39:26 2011
New Revision: 114709
URL: http://wso2.org/svn/browse/wso2?view=rev&revision=114709

Log:
Making trunk-orbit-trust-module.xml sync with branch-orbit-module.xml.

Modified:
   trunk/carbon/orbit/rampart-trust/src/main/resources/META-INF/module.xml

Modified: trunk/carbon/orbit/rampart-trust/src/main/resources/META-INF/module.xml
URL: http://wso2.org/svn/browse/wso2/trunk/carbon/orbit/rampart-trust/src/main/resources/META-INF/module.xml?rev=114709&r1=114708&r2=114709&view=diff
==============================================================================
--- trunk/carbon/orbit/rampart-trust/src/main/resources/META-INF/module.xml	(original)
+++ trunk/carbon/orbit/rampart-trust/src/main/resources/META-INF/module.xml	Sat Oct 22 03:39:26 2011
@@ -15,34 +15,69 @@
  ~ specific language governing permissions and limitations
  ~ under the License.
  -->
-<module name="rahas">
+<module name="rahas" class="org.apache.rahas.Rahas">
     <Description>This module is used to STS enable a service where it adds
         the RequestSecurityToken operation to a service that the module is engaged to</Description>
 
-    <supported-policy-namespaces namespaces="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"/>
-    
+    <supported-policy-namespaces namespaces="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy, http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702
+"/>
+
     <operation name="RequestSecurityToken" mep="http://www.w3.org/2006/01/wsdl/in-out">
         <messageReceiver class="org.apache.rahas.STSMessageReceiver"/>
 
-        <!-- Action mapping to accept SCT requests -->
-        <actionMapping>http://schemas.xmlsoap.org/ws/2005/02/trust/RST/SCT</actionMapping>
-        <actionMapping>http://schemas.xmlsoap.org/ws/2005/02/trust/RST/SCT/Cancel</actionMapping>
+		<!-- Action mapping to accept SCT requests. For submissive version. -->
+		<actionMapping>http://schemas.xmlsoap.org/ws/2005/02/trust/RST/SCT</actionMapping>
+
+		<actionMapping>http://schemas.xmlsoap.org/ws/2005/02/trust/RST/Issue</actionMapping>
+		<actionMapping>http://schemas.xmlsoap.org/ws/2005/02/trust/RST/Renew</actionMapping>
+		<actionMapping>http://schemas.xmlsoap.org/ws/2005/02/trust/RST/Cancel</actionMapping>
+		<actionMapping>http://schemas.xmlsoap.org/ws/2005/02/trust/RST/SCT/Cancel</actionMapping>
+		<actionMapping>http://schemas.xmlsoap.org/ws/2005/02/trust/RST/Validate</actionMapping>
+
+        <!-- Action mapping to accept SCT requests. For standard secure conversation version -->
+		<actionMapping>http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/SCT</actionMapping>
+
+		<actionMapping>http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Issue</actionMapping>
+		<actionMapping>http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Renew</actionMapping>
+		<actionMapping>http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Cancel</actionMapping>
+		<actionMapping>http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/SCT/Cancel</actionMapping>
+		<actionMapping>http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Validate</actionMapping>
 
-        <parameter name="token-dispatcher-configuration">
-            <token-dispatcher-configuration>
+		<parameter name="token-dispatcher-configuration">
+			<token-dispatcher-configuration>
                 <!-- Issuers. You may have many issuers. -->
                 <issuer class="org.apache.rahas.impl.SCTIssuer" default="true">
-                    <configuration type="parameter">sct-issuer-config</configuration>
-                    <tokenType>http://schemas.xmlsoap.org/ws/2005/02/sc/sct</tokenType>
+					<configuration type="parameter">sct-issuer-config</configuration>
+					<tokenType>http://schemas.xmlsoap.org/ws/2005/02/sc/sct</tokenType>
+					<tokenType>http://docs.oasis-open.org/ws-sx/ws-secureconversation/200512/sct</tokenType>
+				</issuer>
+				<issuer class="org.apache.rahas.impl.SAMLTokenIssuer">
+					<configuration type="parameter">saml-issuer-config</configuration>
+					<tokenType>http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV1.1</tokenType>
+				</issuer>
+                <issuer class="org.apache.rahas.impl.SAML2TokenIssuer">
+                        <configuration type="parameter">saml-issuer-config</configuration>
+                        <tokenType>http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV2.0</tokenType>
                 </issuer>
 
+				<validator class="org.apache.rahas.impl.SAMLTokenValidator" default="true">
+                    <configuration type="parameter">saml-issuer-config</configuration>
+                    <tokenType>http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV1.1</tokenType>
+                </validator>
+
                 <!-- Only a single canceler is allowed -->
                 <canceler class="org.apache.rahas.impl.TokenCancelerImpl">
-                    <configuration type="parameter">token-canceler-config</configuration>
-                </canceler>
+					<configuration type="parameter">token-canceler-config</configuration>
+				</canceler>
+
+				<!-- Renewers. You may have many renewers -->
+                <renewer class="org.apache.rahas.impl.SAMLTokenRenewer" default="true">
+                     <configuration type="parameter">saml-issuer-config</configuration>
+                     <tokenType>http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV1.1</tokenType>
+                </renewer>
 
             </token-dispatcher-configuration>
-        </parameter>
+		</parameter>
 
      </operation>