axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ruchi...@apache.org
Subject svn commit: r468900 - in /webservices/axis2/branches/java/1_1/modules/rahas: maven.xml sts-aar-resources/saml-issuer-config.xml sts-aar-resources/sct-issuer-config.xml sts-aar-resources/services.xml sts-aar-resources/token-dispatcher-configuration.xml
Date Sun, 29 Oct 2006 13:18:30 GMT
Author: ruchithf
Date: Sun Oct 29 05:18:29 2006
New Revision: 468900

URL: http://svn.apache.org/viewvc?view=rev&rev=468900
Log:
Copy sts resources into the META-INF dir of the STS.aar

Modified:
    webservices/axis2/branches/java/1_1/modules/rahas/maven.xml
    webservices/axis2/branches/java/1_1/modules/rahas/sts-aar-resources/saml-issuer-config.xml
    webservices/axis2/branches/java/1_1/modules/rahas/sts-aar-resources/sct-issuer-config.xml
    webservices/axis2/branches/java/1_1/modules/rahas/sts-aar-resources/services.xml
    webservices/axis2/branches/java/1_1/modules/rahas/sts-aar-resources/token-dispatcher-configuration.xml

Modified: webservices/axis2/branches/java/1_1/modules/rahas/maven.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/rahas/maven.xml?view=diff&rev=468900&r1=468899&r2=468900
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/rahas/maven.xml (original)
+++ webservices/axis2/branches/java/1_1/modules/rahas/maven.xml Sun Oct 29 05:18:29 2006
@@ -46,12 +46,12 @@
             <fileset dir="target/sts/org/apache/rahas/client"/>
         </delete>
     	
-        <copy file="test-resources/trust/impl/sts-services.xml" toFile="target/sts/META-INF/services.xml"/>
-		
-        <copy file="test-resources/trust/impl/sct-issuer-config.xml" toFile="target/sts/sct-issuer-config.xml"/>
-        <copy file="test-resources/trust/impl/token-dispatcher-configuration.xml" toFile="target/sts/token-dispatcher-configuration.xml"/>
-        <copy file="test-resources/trust/impl/sctIssuer.properties" toFile="target/sts/sctIssuer.properties"/>
-        <copy file="test-resources/trust/impl/sts.jks" toFile="target/sts/sts.jks"/>
+        <copy file="sts-aar-resources/services.xml" toFile="target/sts/META-INF/services.xml"/>
+        <copy file="sts-aar-resources/sct-issuer-config.xml" toFile="target/sts/META-INF/sct-issuer-config.xml"/>
+        <copy file="sts-aar-resources/saml-issuer-config.xml" toFile="target/sts/META-INF/saml-issuer-config.xml"/>
+        <copy file="sts-aar-resources/token-canceler-config.xml" toFile="target/sts/META-INF/token-canceler-config.xml"/>
+        <copy file="sts-aar-resources/token-dispatcher-configuration.xml" toFile="target/sts/META-INF/token-dispatcher-configuration.xml"/>
+        <copy file="sts-aar-resources/rahas-sts.jks" toFile="target/sts/META-INF/rahas-sts.jks"/>
         
         <jar jarfile="target/rahas-${rahas_version}.aar" basedir="target/sts/">
             <include name="**/*"/>

Modified: webservices/axis2/branches/java/1_1/modules/rahas/sts-aar-resources/saml-issuer-config.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/rahas/sts-aar-resources/saml-issuer-config.xml?view=diff&rev=468900&r1=468899&r2=468900
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/rahas/sts-aar-resources/saml-issuer-config.xml
(original)
+++ webservices/axis2/branches/java/1_1/modules/rahas/sts-aar-resources/saml-issuer-config.xml
Sun Oct 29 05:18:29 2006
@@ -10,7 +10,7 @@
     <cryptoProperties>
        <crypto provider="org.apache.ws.security.components.crypto.Merlin">
             <property name="org.apache.ws.security.crypto.merlin.keystore.type">JKS</property>
-            <property name="org.apache.ws.security.crypto.merlin.file">rahas-sts.jks</property>
+            <property name="org.apache.ws.security.crypto.merlin.file">META-INF/rahas-sts.jks</property>
             <property name="org.apache.ws.security.crypto.merlin.keystore.password">password</property>
         </crypto>
     </cryptoProperties>

Modified: webservices/axis2/branches/java/1_1/modules/rahas/sts-aar-resources/sct-issuer-config.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/rahas/sts-aar-resources/sct-issuer-config.xml?view=diff&rev=468900&r1=468899&r2=468900
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/rahas/sts-aar-resources/sct-issuer-config.xml
(original)
+++ webservices/axis2/branches/java/1_1/modules/rahas/sts-aar-resources/sct-issuer-config.xml
Sun Oct 29 05:18:29 2006
@@ -3,7 +3,7 @@
 	<cryptoProperties>
        <crypto provider="org.apache.ws.security.components.crypto.Merlin">
             <property name="org.apache.ws.security.crypto.merlin.keystore.type">JKS</property>
-            <property name="org.apache.ws.security.crypto.merlin.file">sts.jks</property>
+            <property name="org.apache.ws.security.crypto.merlin.file">META-INF/rahas-sts.jks</property>
             <property name="org.apache.ws.security.crypto.merlin.keystore.password">password</property>
         </crypto>
 	</cryptoProperties>

Modified: webservices/axis2/branches/java/1_1/modules/rahas/sts-aar-resources/services.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/rahas/sts-aar-resources/services.xml?view=diff&rev=468900&r1=468899&r2=468900
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/rahas/sts-aar-resources/services.xml (original)
+++ webservices/axis2/branches/java/1_1/modules/rahas/sts-aar-resources/services.xml Sun Oct
29 05:18:29 2006
@@ -16,7 +16,7 @@
 	</operation>
 	
 	<!-- Using the config file -->
-	<parameter name="token-dispatcher-configuration-file">token-dispatcher-configuration.xml</parameter>
+	<parameter name="token-dispatcher-configuration-file">META-INF/token-dispatcher-configuration.xml</parameter>
 	
 	<!-- Configure Rampart to authenticate clients -->
 	<wsp:Policy wsu:Id="SigOnly" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
@@ -32,7 +32,7 @@
 					<ramp:signatureCrypto>
 						<ramp:crypto provider="org.apache.ws.security.components.crypto.Merlin">
 							<ramp:property name="org.apache.ws.security.crypto.merlin.keystore.type">JKS</ramp:property>
-							<ramp:property name="org.apache.ws.security.crypto.merlin.file">rahas-sts.jks</ramp:property>
+							<ramp:property name="org.apache.ws.security.crypto.merlin.file">META-INF/rahas-sts.jks</ramp:property>
 							<ramp:property name="org.apache.ws.security.crypto.merlin.keystore.password">password</ramp:property>
 						</ramp:crypto>
 					</ramp:signatureCrypto>

Modified: webservices/axis2/branches/java/1_1/modules/rahas/sts-aar-resources/token-dispatcher-configuration.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/rahas/sts-aar-resources/token-dispatcher-configuration.xml?view=diff&rev=468900&r1=468899&r2=468900
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/rahas/sts-aar-resources/token-dispatcher-configuration.xml
(original)
+++ webservices/axis2/branches/java/1_1/modules/rahas/sts-aar-resources/token-dispatcher-configuration.xml
Sun Oct 29 05:18:29 2006
@@ -5,13 +5,13 @@
 		<tokenType>http://schemas.xmlsoap.org/ws/2005/02/sc/sct</tokenType>
 	</issuer>
 	<issuer class="org.apache.rahas.impl.SAMLTokenIssuer">
-		<configuration type="file">saml-issuer-config.xml</configuration>
+		<configuration type="file">META-INF/saml-issuer-config.xml</configuration>
 		<tokenType>http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV1.1</tokenType>
 	</issuer>
 
     <!-- Only a single canceler is allowed -->
     <canceler class="org.apache.rahas.impl.TokenCancelerImpl">
-		<configuration type="file">token-canceler-config.xml</configuration>
+		<configuration type="file">META-INF/token-canceler-config.xml</configuration>
 	</canceler>
 
 </token-dispatcher-configuration>



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org


Mime
View raw message