Author: gmazza
Date: Thu Jul 24 05:31:26 2008
New Revision: 679390
URL: http://svn.apache.org/viewvc?rev=679390&view=rev
Log:
Fixed commenting, typos, etc.
Modified:
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/security/client.xml
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/security/server.xml
Modified:
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/security/client.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/security/client.xml?rev=679390&r1=679389&r2=679390&view=diff
==============================================================================
---
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/security/client.xml
(original)
+++
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/security/client.xml
Thu Jul 24 05:31:26 2008
@@ -20,12 +20,17 @@
<beans xmlns="http://www.springframework.org/schema/beans";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:jaxws="http://cxf.apache.org/jaxws";
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
- http://cxf.apache.org/jaxws
http://cxf.apache.org/schemas/jaxws.xsd
- ">
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://cxf.apache.org/jaxws
+ http://cxf.apache.org/schemas/jaxws.xsd";>
- <jaxws:client
name="{http://apache.org/hello_world_soap_http}TimestampSignEncryptPort";
createdFromAPI="true">
+ <!--
+ Client-side endpoint. For this example, Alice is the client
+ and Bob is the service.
+ -->
+ <jaxws:client
name="{http://apache.org/hello_world_soap_http}TimestampSignEncryptPort";
+ createdFromAPI="true">
<jaxws:features>
<bean class="org.apache.cxf.feature.LoggingFeature"/>
</jaxws:features>
@@ -39,11 +44,11 @@
</jaxws:inInterceptors>
</jaxws:client>
- <!-- -->
- <!-- This bean is an Out interceptor which will add a Timestamp, -->
- <!-- sign the Timstamp and Body, and then encrypt the Timestamp -->
- <!-- and Body. It uses 3DES as the symmetric key algorithm. -->
- <!-- -->
+ <!--
+ This bean is an Out interceptor which will add a timestamp,
+ sign the timestamp and body, and then encrypt the timestamp
+ and body. It uses 3DES as the symmetric key algorithm.
+ -->
<bean
class="org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor"
id="TimestampSignEncrypt_Request">
@@ -58,9 +63,9 @@
<entry key="signatureKeyIdentifier" value="DirectReference"/>
<entry key="passwordCallbackClass"
value="org.apache.cxf.systest.ws.security.KeystorePasswordCallback"/>
<entry key="signatureParts"
value="{Element}{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Timestamp;{Element}{http://schemas.xmlsoap.org/soap/envelope/}Body"/>
- <!-- -->
- <!-- Recommendation: signatures should be encrypted -->
- <!-- -->
+ <!--
+ Recommendation: signatures should be encrypted
+ -->
<entry key="encryptionParts"
value="{Element}{http://www.w3.org/2000/09/xmldsig#}Signature;{Content}{http://schemas.xmlsoap.org/soap/envelope/}Body"/>
<!-- <entry key="encryptionKeyTransportAlgorithm"
value="RSA15"/> -->
<entry key="encryptionSymAlgorithm"
value="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
@@ -68,11 +73,10 @@
</constructor-arg>
</bean>
- <!-- -->
- <!-- This bean is an In interceptor which validated a signed, -->
- <!-- encrypted resposne, and timestamped. -->
- <!-- -->
- <!-- -->
+ <!--
+ This bean is an In interceptor which will validate a signed,
+ encrypted response, and timestamp it.
+ -->
<bean
class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor"
id="TimestampSignEncrypt_Response">
Modified:
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/security/server.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/security/server.xml?rev=679390&r1=679389&r2=679390&view=diff
==============================================================================
---
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/security/server.xml
(original)
+++
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/security/server.xml
Thu Jul 24 05:31:26 2008
@@ -23,25 +23,27 @@
xmlns:jaxws="http://cxf.apache.org/jaxws";
xmlns:test="http://apache.org/hello_world_soap_http";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="
- http://cxf.apache.org/core
http://cxf.apache.org/schemas/core.xsd
- http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
- http://cxf.apache.org/jaxws
http://cxf.apache.org/schemas/jaxws.xsd
- ">
+ xsi:schemaLocation="http://cxf.apache.org/core
+ http://cxf.apache.org/schemas/core.xsd
+ http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+ http://cxf.apache.org/jaxws
+ http://cxf.apache.org/schemas/jaxws.xsd";>
- <!-- -->
- <!-- Enable logging at all endpoints -->
- <!-- -->
+ <!--
+ Enable logging at all endpoints
+ -->
<cxf:bus>
<cxf:features>
<bean class="org.apache.cxf.feature.LoggingFeature"/>
</cxf:features>
</cxf:bus>
- <!-- -->
- <!-- UsernameToken endpoint definition -->
- <!-- This endpoint is configired to -->
- <!-- -->
+ <!--
+ UsernameToken endpoint definition
+ This endpoint is configured to read the username and password tokens
+ and validate them using a password callback handler.
+ -->
<jaxws:endpoint
id="UsernameTokenEndpoint"
implementor="org.apache.cxf.systest.ws.security.GreeterImpl"
@@ -54,9 +56,10 @@
<bean class="org.apache.cxf.binding.soap.saaj.SAAJInInterceptor"/>
</jaxws:inInterceptors>
</jaxws:endpoint>
- <!-- -->
- <!-- -->
- <!-- -->
+
+ <!--
+ WSS4JInInterceptor for UsernameTokenEndpoint above
+ -->
<bean
id="UsernameToken_Request"
class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor"
@@ -70,9 +73,11 @@
</constructor-arg>
</bean>
- <!-- -->
- <!-- -->
- <!-- -->
+ <!--
+ TimestampSignEncryptEndpoint endpoint definition
+ This endpoint is configured to work with public key certificates
+ on both client (Alice) and service (Bob) side.
+ -->
<jaxws:endpoint
id="TimestampSignEncryptEndpoint"
implementor="org.apache.cxf.systest.ws.security.GreeterImpl"
@@ -89,9 +94,11 @@
<bean class="org.apache.cxf.binding.soap.saaj.SAAJInInterceptor"/>
</jaxws:inInterceptors>
</jaxws:endpoint>
- <!-- -->
- <!-- -->
- <!-- -->
+
+ <!--
+ WSS4JInInterceptor for decrypting and validating the signature of the
+ SOAP request.
+ -->
<bean
id="TimestampSignEncrypt_Request"
class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor"
@@ -109,9 +116,10 @@
</map>
</constructor-arg>
</bean>
- <!-- -->
- <!-- -->
- <!-- -->
+
+ <!--
+ WSS4JOutInterceptor for encoding and signing the SOAP response.
+ -->
<bean
id="TimestampSignEncrypt_Response"
class="org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor"
@@ -126,9 +134,9 @@
<entry key="signatureKeyIdentifier" value="DirectReference"/>
<entry key="passwordCallbackClass"
value="org.apache.cxf.systest.ws.security.KeystorePasswordCallback"/>
<entry key="signatureParts"
value="{Element}{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Timestamp;{Element}{http://schemas.xmlsoap.org/soap/envelope/}Body"/>
- <!-- -->
- <!-- Recommendation: signatures should be encrypted -->
- <!-- -->
+ <!--
+ Recommendation: signatures should be encrypted
+ -->
<entry key="encryptionParts"
value="{Element}{http://www.w3.org/2000/09/xmldsig#}Signature;{Content}{http://schemas.xmlsoap.org/soap/envelope/}Body"/>
<!-- <entry key="encryptionKeyTransportAlgorithm"
value="RSA15"/> -->
<entry key="encryptionSymAlgorithm"
value="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
