cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ashaki...@apache.org
Subject svn commit: r1484794 [2/2] - in /cxf/trunk/services/xkms: xkms-client/ xkms-client/src/main/resources/OSGI-INF/blueprint/ xkms-common/ xkms-features/ xkms-features/src/main/resources/ xkms-itests/ xkms-itests/src/test/resources/ xkms-osgi/ xkms-osgi/sr...
Date Tue, 21 May 2013 13:13:09 GMT
Modified: cxf/trunk/services/xkms/xkms-war/src/main/webapp/WEB-INF/xkms-key-handlers.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/services/xkms/xkms-war/src/main/webapp/WEB-INF/xkms-key-handlers.xml?rev=1484794&r1=1484793&r2=1484794&view=diff
==============================================================================
--- cxf/trunk/services/xkms/xkms-war/src/main/webapp/WEB-INF/xkms-key-handlers.xml (original)
+++ cxf/trunk/services/xkms/xkms-war/src/main/webapp/WEB-INF/xkms-key-handlers.xml Tue May 21 13:13:08 2013
@@ -1,15 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (c) 2008, 2009 SOPERA GmbH. All rights reserved. This program 
-    and the accompanying materials are made available under the terms of the 
-    Eclipse Public License v1.0 which accompanies this distribution, and is available 
-    at http://www.eclipse.org/legal/epl-v10.html Contributors: SOPERA GmbH - 
-    initial API and implementation -->
-<beans 
-    xmlns="http://www.springframework.org/schema/beans"
-    xmlns:cxf="http://cxf.apache.org/core"
-    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"
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements. See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership. The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License. You may obtain a copy of the License at
+ 
+  http://www.apache.org/licenses/LICENSE-2.0
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied. See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+    xmlns:cxf="http://cxf.apache.org/core" 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"
     xmlns:util="http://www.springframework.org/schema/util"
     xsi:schemaLocation="
         http://cxf.apache.org/core
@@ -21,47 +31,51 @@
         http://www.springframework.org/schema/util
         http://www.springframework.org/schema/util/spring-util-2.0.xsd">
 
-   <bean id="dateValidator" class="org.apache.cxf.xkms.x509.validator.DateValidator" />
+    <bean id="dateValidator" class="org.apache.cxf.xkms.x509.validator.DateValidator" />
 
-<!--
-   <bean id="ldapSchemaConfig" class="org.apache.cxf.xkms.x509.handlers.LdapSchemaConfig">
-      <property name="certObjectClass" value="inetOrgPerson" />
-      <property name="attrUID" value="uid" />
-      <property name="attrIssuerID" value="manager" />
-      <property name="attrSerialNumber" value="employeeNumber" />
-      <property name="attrCrtBinary" value="userCertificate;binary" />
-      <property name="constAttrNamesCSV" value="sn" />
-      <property name="constAttrValuesCSV" value="X509 certificate" />
-      <property name="serviceCertRDNTemplate" value="cn=%s,ou=services" />
-      <property name="serviceCertUIDTemplate" value="cn=%s" />
-   </bean>
-
-   <bean id="x509LdapLocator" class="org.apache.cxf.xkms.x509.locator.LdapLocator">
-      <constructor-arg ref="ldapSearch" />
-      <constructor-arg ref="ldapSchemaConfig" />
-      <constructor-arg value="dc=example,dc=com" />
-   </bean>
-
-    <bean id="ldapRegisterHandler" class="org.apache.cxf.xkms.x509.handlers.LdapRegisterHandler">
-      <constructor-arg ref="ldapSearch" />
-      <constructor-arg ref="ldapSchemaConfig" />
-      <constructor-arg value="dc=example,dc=com" />
-   </bean>
-
-   <bean id="ldapSearch" class="org.apache.cxf.xkms.x509.handlers.LdapSearch">
-      <constructor-arg value="ldap://localhost:2389" />
-      <constructor-arg value="cn=Directory Manager" />
-      <constructor-arg value="test" />
-      <constructor-arg value="2" />
-   </bean>
--->
+<!-- LDAP based implementation -->
+
+    <bean id="ldapSchemaConfig" class="org.apache.cxf.xkms.x509.handlers.LdapSchemaConfig">
+        <property name="certObjectClass" value="inetOrgPerson" />
+        <property name="attrUID" value="uid" />
+        <property name="attrIssuerID" value="manager" />
+        <property name="attrSerialNumber" value="employeeNumber" />
+        <property name="attrCrtBinary" value="userCertificate;binary" />
+        <property name="constAttrNamesCSV" value="sn" />
+        <property name="constAttrValuesCSV" value="X509 certificate" />
+        <property name="serviceCertRDNTemplate" value="cn=%s,ou=services" />
+        <property name="serviceCertUIDTemplate" value="cn=%s" />
+    </bean>
+
+    <bean id="x509LdapLocator" class="org.apache.cxf.xkms.x509.locator.LdapLocator">
+        <constructor-arg ref="ldapSearch" />
+        <constructor-arg ref="ldapSchemaConfig" />
+        <constructor-arg value="dc=example,dc=com" />
+    </bean>
+
+    <bean id="ldapRegisterHandler"
+        class="org.apache.cxf.xkms.x509.handlers.LdapRegisterHandler">
+        <constructor-arg ref="ldapSearch" />
+        <constructor-arg ref="ldapSchemaConfig" />
+        <constructor-arg value="dc=example,dc=com" />
+    </bean>
+
+    <bean id="ldapSearch" class="org.apache.cxf.xkms.x509.handlers.LdapSearch">
+        <constructor-arg value="ldap://localhost:2389" />
+        <constructor-arg value="cn=Directory Manager" />
+        <constructor-arg value="test" />
+        <constructor-arg value="2" />
+    </bean>
+
+<!-- File based implementation -->
+ 
+    <bean id="x509FileLocator" class="org.apache.cxf.xkms.x509.locator.FileLocator">
+        <constructor-arg value="../conf/certs" />
+    </bean>
+
+    <bean id="fileRegisterHandler"
+        class="org.apache.cxf.xkms.x509.handlers.FileRegisterHandler">
+        <constructor-arg value="../conf/certs" />
+    </bean>
 
-   <bean id="x509FileLocator" class="org.apache.cxf.xkms.x509.locator.FileLocator">
-      <constructor-arg value="../conf/certs" />
-   </bean>
-
-   <bean id="fileRegisterHandler" class="org.apache.cxf.xkms.x509.handlers.FileRegisterHandler">
-      <constructor-arg value="../conf/certs" />
-   </bean>
-   
 </beans>

Modified: cxf/trunk/services/xkms/xkms-x509-handlers/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/services/xkms/xkms-x509-handlers/pom.xml?rev=1484794&r1=1484793&r2=1484794&view=diff
==============================================================================
--- cxf/trunk/services/xkms/xkms-x509-handlers/pom.xml (original)
+++ cxf/trunk/services/xkms/xkms-x509-handlers/pom.xml Tue May 21 13:13:08 2013
@@ -1,89 +1,95 @@
-<?xml version="1.0"?>
-<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor 
-	license agreements. See the NOTICE file distributed with this work for additional 
-	information regarding copyright ownership. The ASF licenses this file to 
-	you under the Apache License, Version 2.0 (the "License"); you may not use 
-	this file except in compliance with the License. You may obtain a copy of 
-	the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required 
-	by applicable law or agreed to in writing, software distributed under the 
-	License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 
-	OF ANY KIND, either express or implied. See the License for the specific 
-	language governing permissions and limitations under the License. 
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements. See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership. The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License. You may obtain a copy of the License at
+ 
+  http://www.apache.org/licenses/LICENSE-2.0
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied. See the License for the
+  specific language governing permissions and limitations
+  under the License.
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.apache.cxf.services.xkms</groupId>
-	<artifactId>cxf-services-xkms-x509-handlers</artifactId>
-	<packaging>bundle</packaging>
-	<name>Apache CXF XKMS X509 Handlers</name>
-	<url>http://cxf.apache.org</url>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.apache.cxf.services.xkms</groupId>
+    <artifactId>cxf-services-xkms-x509-handlers</artifactId>
+    <packaging>bundle</packaging>
+    <name>Apache CXF XKMS X509 Handlers</name>
+    <url>http://cxf.apache.org</url>
 
-	<parent>
-		<groupId>org.apache.cxf</groupId>
-		<artifactId>cxf-parent</artifactId>
-		<version>3.0.0-SNAPSHOT</version>
-		<relativePath>../../../parent/pom.xml</relativePath>
-	</parent>
+    <parent>
+        <groupId>org.apache.cxf</groupId>
+        <artifactId>cxf-parent</artifactId>
+        <version>3.0.0-SNAPSHOT</version>
+        <relativePath>../../../parent/pom.xml</relativePath>
+    </parent>
 
-	<dependencies>
-		<dependency>
-			<groupId>org.apache.cxf</groupId>
-			<artifactId>cxf-api</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.cxf.services.xkms</groupId>
-			<artifactId>cxf-services-xkms-service</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-api</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.easymock</groupId>
-			<artifactId>easymock</artifactId>
-			<scope>test</scope>
-		</dependency>
-                <dependency>
-                        <groupId>junit</groupId>
-                        <artifactId>junit</artifactId>
-                        <scope>test</scope>
-                </dependency>
-	</dependencies>
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf.services.xkms</groupId>
+            <artifactId>cxf-services-xkms-service</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.easymock</groupId>
+            <artifactId>easymock</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
 
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.felix</groupId>
-				<artifactId>maven-bundle-plugin</artifactId>
-				<extensions>true</extensions>
-				<configuration>
-					<instructions>
-						<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-					</instructions>
-				</configuration>
-			</plugin>
-			<plugin>
-          <groupId>org.eclipse.tycho</groupId>
-          <artifactId>tycho-packaging-plugin</artifactId>
-          <executions>
-            <execution>
-              <id>timestamp</id>
-              <phase>validate</phase>
-              <goals>
-                <goal>build-qualifier</goal>
-              </goals>
-            </execution>
-          </executions>
-        	</plugin>
-		</plugins>
-	</build>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                    </instructions>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.eclipse.tycho</groupId>
+                <artifactId>tycho-packaging-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>timestamp</id>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>build-qualifier</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>

Modified: cxf/trunk/services/xkms/xkms-x509-handlers/src/test/resources/registerRequest.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/services/xkms/xkms-x509-handlers/src/test/resources/registerRequest.xml?rev=1484794&r1=1484793&r2=1484794&view=diff
==============================================================================
--- cxf/trunk/services/xkms/xkms-x509-handlers/src/test/resources/registerRequest.xml (original)
+++ cxf/trunk/services/xkms/xkms-x509-handlers/src/test/resources/registerRequest.xml Tue May 21 13:13:08 2013
@@ -1,76 +1,82 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RegisterRequest xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-   xmlns:xenc="http://www.w3.org/2001/04/xmlenc#"
-   Id="I1494ac4351b7de5c174d455b7000e18f"
-   Service="http://www.example.org/XKMS"
-   xmlns="http://www.w3.org/2002/03/xkms#">
-  <RespondWith>http://www.w3.org/2002/03/xkms#X509Cert</RespondWith>
-  <RespondWith>http://www.w3.org/2002/03/xkms#X509Chain</RespondWith>
-  <PrototypeKeyBinding Id="I269e655567dbae568591c0a06957529e">
-    <ds:KeyInfo>
-      <ds:KeyValue>
-        <ds:RSAKeyValue>
-          <ds:Modulus>
-            0nIsmR+aVW2egl5MIfOKy4HuMKkk9AZ/IQuDLVPlhzOfgngjVQCjr8uvmnqtNu8
-            HBupui8LgGthO6U9D0CNT5mbmhIAErRADUMIAFsi7LzBarUvNWTqYNEJmcHsAUZ
-            drdcDrkNnG7SzbuJx+GDNiHKVDQggPBLc1XagW20RMvok=
-          </ds:Modulus>
-          <ds:Exponent>AQAB</ds:Exponent>
-        </ds:RSAKeyValue>
-      </ds:KeyValue>
-    </ds:KeyInfo>
-    <KeyUsage>http://www.w3.org/2002/03/xkms#Signature</KeyUsage>
-    <KeyUsage>http://www.w3.org/2002/03/xkms#Encryption</KeyUsage>
-    <KeyUsage>http://www.w3.org/2002/03/xkms#Exchange</KeyUsage>
-    <UseKeyWith Application="urn:ietf:rfc:2459"
-         Identifier='C="US" O="Alice Corp" CN="Alice Aardvark"' />
-    <UseKeyWith Application="urn:ietf:rfc:2633"
-         Identifier="alice@example.com" />
-    <UseKeyWith Application="http://ca.example.com/cps/20030401/class3"
-         Identifier="alice@example.com" />
-    <RevocationCodeIdentifier>
-      5AEAai06hFJEkuqyDyqNh8k/u3M=
-    </RevocationCodeIdentifier>
-  </PrototypeKeyBinding>
-  <Authentication>
-    <KeyBindingAuthentication>
-      <Signature xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <SignedInfo>
-          <CanonicalizationMethod 
-                  Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
-          <SignatureMethod 
-                  Algorithm="http://www.w3.org/2000/09/xmldsig#hmac-sha1" />
-          <Reference URI="#I269e655567dbae568591c0a06957529e">
-            <Transforms>
-              <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
-            </Transforms>
-            <DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-            <DigestValue>WCbpkifxJ1zIJ+V6/knZgxRhR34=</DigestValue>
-          </Reference>
-        </SignedInfo>
-        <SignatureValue>iJSKM+98hj5ae+btC2WjwBYP+/k=</SignatureValue>
-      </Signature>
-    </KeyBindingAuthentication>
-  </Authentication>
-  <ProofOfPossession>
-    <Signature xmlns="http://www.w3.org/2000/09/xmldsig#">
-      <SignedInfo>
-        <CanonicalizationMethod 
-                Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
-        <SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1" />
-        <Reference URI="#I269e655567dbae568591c0a06957529e">
-          <Transforms>
-            <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
-          </Transforms>
-          <DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-          <DigestValue>WCbpkifxJ1zIJ+V6/knZgxRhR34=</DigestValue>
-        </Reference>
-      </SignedInfo>
-      <SignatureValue>
-        DcPw742vN120QNrCjCKw0jiCX3pUvbMeRkYjktZkn4nbgo1b7leXU0sJgXM2CY/
-        oQugaRsgz18+qUzM0UX+jr1t1wtCMci5fjzVKZB63oZyKZ9+CJLcBCbirsgJAId
-        +Pq9w4WiwKDf2AytsdXHlN5V1byQIkpfR1CypvBzQa1b4=
-      </SignatureValue>
-    </Signature>
-  </ProofOfPossession>
+    xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" Id="I1494ac4351b7de5c174d455b7000e18f"
+    Service="http://www.example.org/XKMS" xmlns="http://www.w3.org/2002/03/xkms#">
+    <RespondWith>http://www.w3.org/2002/03/xkms#X509Cert</RespondWith>
+    <RespondWith>http://www.w3.org/2002/03/xkms#X509Chain</RespondWith>
+    <PrototypeKeyBinding Id="I269e655567dbae568591c0a06957529e">
+        <ds:KeyInfo>
+            <ds:KeyValue>
+                <ds:RSAKeyValue>
+                    <ds:Modulus>
+                        0nIsmR+aVW2egl5MIfOKy4HuMKkk9AZ/IQuDLVPlhzOfgngjVQCjr8uvmnqtNu8
+                        HBupui8LgGthO6U9D0CNT5mbmhIAErRADUMIAFsi7LzBarUvNWTqYNEJmcHsAUZ
+                        drdcDrkNnG7SzbuJx+GDNiHKVDQggPBLc1XagW20RMvok=
+                    </ds:Modulus>
+                    <ds:Exponent>AQAB</ds:Exponent>
+                </ds:RSAKeyValue>
+            </ds:KeyValue>
+        </ds:KeyInfo>
+        <KeyUsage>http://www.w3.org/2002/03/xkms#Signature</KeyUsage>
+        <KeyUsage>http://www.w3.org/2002/03/xkms#Encryption</KeyUsage>
+        <KeyUsage>http://www.w3.org/2002/03/xkms#Exchange</KeyUsage>
+        <UseKeyWith Application="urn:ietf:rfc:2459"
+            Identifier='C="US" O="Alice Corp" CN="Alice Aardvark"' />
+        <UseKeyWith Application="urn:ietf:rfc:2633"
+            Identifier="alice@example.com" />
+        <UseKeyWith Application="http://ca.example.com/cps/20030401/class3"
+            Identifier="alice@example.com" />
+        <RevocationCodeIdentifier>
+            5AEAai06hFJEkuqyDyqNh8k/u3M=
+        </RevocationCodeIdentifier>
+    </PrototypeKeyBinding>
+    <Authentication>
+        <KeyBindingAuthentication>
+            <Signature xmlns="http://www.w3.org/2000/09/xmldsig#">
+                <SignedInfo>
+                    <CanonicalizationMethod
+                        Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+                    <SignatureMethod
+                        Algorithm="http://www.w3.org/2000/09/xmldsig#hmac-sha1" />
+                    <Reference URI="#I269e655567dbae568591c0a06957529e">
+                        <Transforms>
+                            <Transform
+                                Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+                        </Transforms>
+                        <DigestMethod
+                            Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
+                        <DigestValue>WCbpkifxJ1zIJ+V6/knZgxRhR34=
+                        </DigestValue>
+                    </Reference>
+                </SignedInfo>
+                <SignatureValue>iJSKM+98hj5ae+btC2WjwBYP+/k=
+                </SignatureValue>
+            </Signature>
+        </KeyBindingAuthentication>
+    </Authentication>
+    <ProofOfPossession>
+        <Signature xmlns="http://www.w3.org/2000/09/xmldsig#">
+            <SignedInfo>
+                <CanonicalizationMethod
+                    Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+                <SignatureMethod
+                    Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1" />
+                <Reference URI="#I269e655567dbae568591c0a06957529e">
+                    <Transforms>
+                        <Transform
+                            Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+                    </Transforms>
+                    <DigestMethod
+                        Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
+                    <DigestValue>WCbpkifxJ1zIJ+V6/knZgxRhR34=
+                    </DigestValue>
+                </Reference>
+            </SignedInfo>
+            <SignatureValue>
+                DcPw742vN120QNrCjCKw0jiCX3pUvbMeRkYjktZkn4nbgo1b7leXU0sJgXM2CY/
+                oQugaRsgz18+qUzM0UX+jr1t1wtCMci5fjzVKZB63oZyKZ9+CJLcBCbirsgJAId
+                +Pq9w4WiwKDf2AytsdXHlN5V1byQIkpfR1CypvBzQa1b4=
+            </SignatureValue>
+        </Signature>
+    </ProofOfPossession>
 </RegisterRequest> 

Modified: cxf/trunk/services/xkms/xkms-x509-handlers/src/test/resources/registerRequestWithCertificate.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/services/xkms/xkms-x509-handlers/src/test/resources/registerRequestWithCertificate.xml?rev=1484794&r1=1484793&r2=1484794&view=diff
==============================================================================
--- cxf/trunk/services/xkms/xkms-x509-handlers/src/test/resources/registerRequestWithCertificate.xml (original)
+++ cxf/trunk/services/xkms/xkms-x509-handlers/src/test/resources/registerRequestWithCertificate.xml Tue May 21 13:13:08 2013
@@ -1,64 +1,74 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RegisterRequest xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-	xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" Id="I1494ac4351b7de5c174d455b7000e18f"
-	Service="http://www.example.org/XKMS" xmlns="http://www.w3.org/2002/03/xkms#">
-	<RespondWith>http://www.w3.org/2002/03/xkms#X509Cert</RespondWith>
-	<RespondWith>http://www.w3.org/2002/03/xkms#X509Chain</RespondWith>
-	<PrototypeKeyBinding Id="I269e655567dbae568591c0a06957529e">
-		<ds:KeyInfo>
-			<ds:X509Data>
-				<ds:X509Certificate>MIIFIjCCAwoCAQEwDQYJKoZIhvcNAQEFBQAwUzEPMA0GA1UEChMGSXNzdWVyMQswCQYDVQQGEwJERTEMMAoGA1UECBMDTlJXMQwwCgYDVQQHEwNDR04xFzAVBgNVBAMTDnd3dy5pc3N1ZXIuY29tMB4XDTEyMDIyOTEyMjMxOVoXDTEzMDIyODEyMjMxOVowWzETMBEGA1UEChMKQW5vdGhlclNUUzELMAkGA1UEBhMCREUxDDAKBgNVBAgTA05SVzEMMAoGA1UEBxMDQ0dOMRswGQYDVQQDExJ3d3cuYW5vdGhlcnN0cy5jb20wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC89tdiW7NQcof51k/9T0X12bAuXlxS+KhRhwnruus1D5zLhw391fGUEU/3gGdQ5HXuwE2sIGVWfoaR71nd0uWl7ACfwuv4Isgblvvaa6XKzhGsG2bLDM/M0Swghr/YgO/627iuESOJ2Ub2ejYDVWk6HOTZOHdA9IUcXwJxntG1eiFCxcAsJOVs5fu4BFVq2gu2idi4QCuhxpAOEqY/hT5HsMT7sTPhsLZxC9MDY3Z04bikulOwRSpi+21w4xqlkVxAjxMFuB7kANQONNfapgOf2rY/sDETH8catfBvPiDXfRFouIPmqVssvRTbHlIXm3z0dM9fw6N/mkfNdt/BmONtfHr12qgErWg3kUpnDxshOPI7qqISQHR76zxLSTZaLeSplPVE5aPuvCTGQMNpujJIMKTQCUo9sgabu0JpwkaT0zMAJJXIDPV1kwEMf7jU/IhsppCBW1il02LC5I9hytYZyXHylpyEOqR0VOLw+7a0F5NGz95X6K6YMKUlmCnPjhdJDz4CFSqeyH0/7O69vooEYIHEOWEQRKtqb1qYWcx/P/gYU49IcQMB7Z87+i0StsA1D66FK5l3ejEWYOR0UIonzXTtCukmR
 gCXeUBbO5skE70HMoJmQfKTfhNLdx480SbfkwJ9cLc5lRFimjEbtcYn/bYQvbnR+hprGnd4+36jvwIDAQABMA0GCSqGSIb3DQEBBQUAA4ICAQBLKToriq3mex/ZHPTPh14RIONwzpXzmLvx9UjsxUI2k49OJHWrowLyEtyX4TLf9Gd9POAmjFBWxWK2nQLYisWQg07NSgOWDvtGj1Ql6XjGdY59JYh1N1h+Ppd/Sb/FsPDN+CQ7+8Xf2nfocbJafktOI6xZJe4PynENi/TIjjX6mdBN4pirNtLXCPzEVyP8MDphrmBrSGGTYU3loz9TzsLfiDLbh5x2Nyg33hSolGOpfHXFNFAo3T/fMA47vmr07qh7cKwJw6loxcU1AcC/Uhab6QgWySHyTyguH7EFGN9a0/7IRynd+UVqErA2DyjCE6mgzzT7mqVg5ox8W4Flzq2kmip8foLAZ4zW6b19y71+2LUVIPguEfufhLbpmmF65ezDZUmYRYFFHWulhPufSpfEUZguKXIM0voIXAgYrbdtLmHPTGb8Qm3qPDcVQJsOEeqTDbRB9nnXP1t+gaSKr/IO597Mr9o9+TUq2WlH1H3NauLL3XCsWmL0pBEBM8a5fMxs04xPdW9V6A8EyHk4CcSOofMJiAZQIlllqsdYQBsOD/iGVHeVYXSnP0PnQmCjdQMaoGIl/dC6oLuk2EerekIuR1NVMdGchpPY/Q2GQmpnnou0faCK/pE9nUEoh+uxva6iOi7Ns2O3gR2aXxeZM1Bgm4SwTnAl5Acnpy5Forg5pg==
-				</ds:X509Certificate>
-			</ds:X509Data>
-		</ds:KeyInfo>
-		<KeyUsage>http://www.w3.org/2002/03/xkms#Signature</KeyUsage>
-		<KeyUsage>http://www.w3.org/2002/03/xkms#Encryption</KeyUsage>
-		<KeyUsage>http://www.w3.org/2002/03/xkms#Exchange</KeyUsage>
-		<UseKeyWith Application="urn:ietf:rfc:2459"
-			Identifier='C="US" O="Alice Corp" CN="Alice Aardvark"' />
-		<!-- <UseKeyWith Application="urn:ietf:rfc:2633" Identifier="alice@example.com" />
-		<UseKeyWith Application="http://ca.example.com/cps/20030401/class3"
-			Identifier="alice@example.com" /> -->
-		<RevocationCodeIdentifier>
-			5AEAai06hFJEkuqyDyqNh8k/u3M=
-		</RevocationCodeIdentifier>
-	</PrototypeKeyBinding>
-	<Authentication>
-		<KeyBindingAuthentication>
-			<Signature xmlns="http://www.w3.org/2000/09/xmldsig#">
-				<SignedInfo>
-					<CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
-					<SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#hmac-sha1" />
-					<Reference URI="#I269e655567dbae568591c0a06957529e">
-						<Transforms>
-							<Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
-						</Transforms>
-						<DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-						<DigestValue>WCbpkifxJ1zIJ+V6/knZgxRhR34=</DigestValue>
-					</Reference>
-				</SignedInfo>
-				<SignatureValue>iJSKM+98hj5ae+btC2WjwBYP+/k=</SignatureValue>
-			</Signature>
-		</KeyBindingAuthentication>
-	</Authentication>
-	<ProofOfPossession>
-		<Signature xmlns="http://www.w3.org/2000/09/xmldsig#">
-			<SignedInfo>
-				<CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
-				<SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1" />
-				<Reference URI="#I269e655567dbae568591c0a06957529e">
-					<Transforms>
-						<Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
-					</Transforms>
-					<DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-					<DigestValue>WCbpkifxJ1zIJ+V6/knZgxRhR34=</DigestValue>
-				</Reference>
-			</SignedInfo>
-			<SignatureValue>
-				DcPw742vN120QNrCjCKw0jiCX3pUvbMeRkYjktZkn4nbgo1b7leXU0sJgXM2CY/
-				oQugaRsgz18+qUzM0UX+jr1t1wtCMci5fjzVKZB63oZyKZ9+CJLcBCbirsgJAId
-				+Pq9w4WiwKDf2AytsdXHlN5V1byQIkpfR1CypvBzQa1b4=
-			</SignatureValue>
-		</Signature>
-	</ProofOfPossession>
+    xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" Id="I1494ac4351b7de5c174d455b7000e18f"
+    Service="http://www.example.org/XKMS" xmlns="http://www.w3.org/2002/03/xkms#">
+    <RespondWith>http://www.w3.org/2002/03/xkms#X509Cert</RespondWith>
+    <RespondWith>http://www.w3.org/2002/03/xkms#X509Chain</RespondWith>
+    <PrototypeKeyBinding Id="I269e655567dbae568591c0a06957529e">
+        <ds:KeyInfo>
+            <ds:X509Data>
+                <ds:X509Certificate>MIIFIjCCAwoCAQEwDQYJKoZIhvcNAQEFBQAwUzEPMA0GA1UEChMGSXNzdWVyMQswCQYDVQQGEwJERTEMMAoGA1UECBMDTlJXMQwwCgYDVQQHEwNDR04xFzAVBgNVBAMTDnd3dy5pc3N1ZXIuY29tMB4XDTEyMDIyOTEyMjMxOVoXDTEzMDIyODEyMjMxOVowWzETMBEGA1UEChMKQW5vdGhlclNUUzELMAkGA1UEBhMCREUxDDAKBgNVBAgTA05SVzEMMAoGA1UEBxMDQ0dOMRswGQYDVQQDExJ3d3cuYW5vdGhlcnN0cy5jb20wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC89tdiW7NQcof51k/9T0X12bAuXlxS+KhRhwnruus1D5zLhw391fGUEU/3gGdQ5HXuwE2sIGVWfoaR71nd0uWl7ACfwuv4Isgblvvaa6XKzhGsG2bLDM/M0Swghr/YgO/627iuESOJ2Ub2ejYDVWk6HOTZOHdA9IUcXwJxntG1eiFCxcAsJOVs5fu4BFVq2gu2idi4QCuhxpAOEqY/hT5HsMT7sTPhsLZxC9MDY3Z04bikulOwRSpi+21w4xqlkVxAjxMFuB7kANQONNfapgOf2rY/sDETH8catfBvPiDXfRFouIPmqVssvRTbHlIXm3z0dM9fw6N/mkfNdt/BmONtfHr12qgErWg3kUpnDxshOPI7qqISQHR76zxLSTZaLeSplPVE5aPuvCTGQMNpujJIMKTQCUo9sgabu0JpwkaT0zMAJJXIDPV1kwEMf7jU/IhsppCBW1il02LC5I9hytYZyXHylpyEOqR0VOLw+7a0F5NGz95X6K6YMKUlmCnPjhdJDz4CFSqeyH0/7O69vooEYIHEOWEQRKtqb1qYWcx/P/gYU49IcQMB7Z87+i0StsA1D66FK5l3ejEWYOR0U
 IonzXTtCukmRgCXeUBbO5skE70HMoJmQfKTfhNLdx480SbfkwJ9cLc5lRFimjEbtcYn/bYQvbnR+hprGnd4+36jvwIDAQABMA0GCSqGSIb3DQEBBQUAA4ICAQBLKToriq3mex/ZHPTPh14RIONwzpXzmLvx9UjsxUI2k49OJHWrowLyEtyX4TLf9Gd9POAmjFBWxWK2nQLYisWQg07NSgOWDvtGj1Ql6XjGdY59JYh1N1h+Ppd/Sb/FsPDN+CQ7+8Xf2nfocbJafktOI6xZJe4PynENi/TIjjX6mdBN4pirNtLXCPzEVyP8MDphrmBrSGGTYU3loz9TzsLfiDLbh5x2Nyg33hSolGOpfHXFNFAo3T/fMA47vmr07qh7cKwJw6loxcU1AcC/Uhab6QgWySHyTyguH7EFGN9a0/7IRynd+UVqErA2DyjCE6mgzzT7mqVg5ox8W4Flzq2kmip8foLAZ4zW6b19y71+2LUVIPguEfufhLbpmmF65ezDZUmYRYFFHWulhPufSpfEUZguKXIM0voIXAgYrbdtLmHPTGb8Qm3qPDcVQJsOEeqTDbRB9nnXP1t+gaSKr/IO597Mr9o9+TUq2WlH1H3NauLL3XCsWmL0pBEBM8a5fMxs04xPdW9V6A8EyHk4CcSOofMJiAZQIlllqsdYQBsOD/iGVHeVYXSnP0PnQmCjdQMaoGIl/dC6oLuk2EerekIuR1NVMdGchpPY/Q2GQmpnnou0faCK/pE9nUEoh+uxva6iOi7Ns2O3gR2aXxeZM1Bgm4SwTnAl5Acnpy5Forg5pg==
+                </ds:X509Certificate>
+            </ds:X509Data>
+        </ds:KeyInfo>
+        <KeyUsage>http://www.w3.org/2002/03/xkms#Signature</KeyUsage>
+        <KeyUsage>http://www.w3.org/2002/03/xkms#Encryption</KeyUsage>
+        <KeyUsage>http://www.w3.org/2002/03/xkms#Exchange</KeyUsage>
+        <UseKeyWith Application="urn:ietf:rfc:2459"
+            Identifier='C="US" O="Alice Corp" CN="Alice Aardvark"' />
+        <!-- <UseKeyWith Application="urn:ietf:rfc:2633" Identifier="alice@example.com" 
+            /> <UseKeyWith Application="http://ca.example.com/cps/20030401/class3" Identifier="alice@example.com" 
+            /> -->
+        <RevocationCodeIdentifier>
+            5AEAai06hFJEkuqyDyqNh8k/u3M=
+        </RevocationCodeIdentifier>
+    </PrototypeKeyBinding>
+    <Authentication>
+        <KeyBindingAuthentication>
+            <Signature xmlns="http://www.w3.org/2000/09/xmldsig#">
+                <SignedInfo>
+                    <CanonicalizationMethod
+                        Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+                    <SignatureMethod
+                        Algorithm="http://www.w3.org/2000/09/xmldsig#hmac-sha1" />
+                    <Reference URI="#I269e655567dbae568591c0a06957529e">
+                        <Transforms>
+                            <Transform
+                                Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+                        </Transforms>
+                        <DigestMethod
+                            Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
+                        <DigestValue>WCbpkifxJ1zIJ+V6/knZgxRhR34=</DigestValue>
+                    </Reference>
+                </SignedInfo>
+                <SignatureValue>iJSKM+98hj5ae+btC2WjwBYP+/k=
+                </SignatureValue>
+            </Signature>
+        </KeyBindingAuthentication>
+    </Authentication>
+    <ProofOfPossession>
+        <Signature xmlns="http://www.w3.org/2000/09/xmldsig#">
+            <SignedInfo>
+                <CanonicalizationMethod
+                    Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+                <SignatureMethod
+                    Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1" />
+                <Reference URI="#I269e655567dbae568591c0a06957529e">
+                    <Transforms>
+                        <Transform
+                            Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+                    </Transforms>
+                    <DigestMethod
+                        Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
+                    <DigestValue>WCbpkifxJ1zIJ+V6/knZgxRhR34=
+                    </DigestValue>
+                </Reference>
+            </SignedInfo>
+            <SignatureValue>
+                DcPw742vN120QNrCjCKw0jiCX3pUvbMeRkYjktZkn4nbgo1b7leXU0sJgXM2CY/
+                oQugaRsgz18+qUzM0UX+jr1t1wtCMci5fjzVKZB63oZyKZ9+CJLcBCbirsgJAId
+                +Pq9w4WiwKDf2AytsdXHlN5V1byQIkpfR1CypvBzQa1b4=
+            </SignatureValue>
+        </Signature>
+    </ProofOfPossession>
 </RegisterRequest> 

Modified: cxf/trunk/services/xkms/xkms-x509-handlers/src/test/resources/registerResult.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/services/xkms/xkms-x509-handlers/src/test/resources/registerResult.xml?rev=1484794&r1=1484793&r2=1484794&view=diff
==============================================================================
--- cxf/trunk/services/xkms/xkms-x509-handlers/src/test/resources/registerResult.xml (original)
+++ cxf/trunk/services/xkms/xkms-x509-handlers/src/test/resources/registerResult.xml Tue May 21 13:13:08 2013
@@ -1,57 +1,59 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RegisterResult xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-      xmlns:xenc="http://www.w3.org/2001/04/xmlenc#"
-      Id="I92ed24772e43843b3d23020ad9ec9754"
-      Service="http://www.example.org/XKMS"
-      ResultMajor="http://www.w3.org/2002/03/xkms#Success"
-      RequestId="I1494ac4351b7de5c174d455b7000e18f"
-      xmlns="http://www.w3.org/2002/03/xkms#">
-  <KeyBinding Id="Ia26450ebe93f62b3b3ab137fc6a61c36">
-    <ds:KeyInfo>
-      <ds:X509Data>
-        <ds:X509Certificate>
-          MIICEDCCAX2gAwIBAgIQimXeUAxYJbJMady9vV1bLjAJBgUrDgMCHQUAMBIxEDA
-          OBgNVBAMTB1Rlc3QgQ0EwHhcNMDMwODE1MDcwMDAwWhcNMDUwODE1MDY1OTU5Wj
-          ArMSkwJwYDVQQDEyBBbGljZSBBYXJkdmFyayBPPUFsaWNlIENvcnAgQz1VUzCBn
-          zANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA0nIsmR+aVW2egl5MIfOKy4HuMKkk
-          9AZ/IQuDLVPlhzOfgngjVQCjr8uvmnqtNu8HBupui8LgGthO6U9D0CNT5mbmhIA
-          ErRADUMIAFsi7LzBarUvNWTqYNEJmcHsAUZdrdcDrkNnG7SzbuJx+GDNiHKVDQg
-          gPBLc1XagW20RMvokCAwEAAaNWMFQwDQYDVR0KBAYwBAMCBkAwQwYDVR0BBDwwO
-          oAQAaVOkaVLLKoFmLN37pC8uqEUMBIxEDAOBgNVBAMTB1Rlc3QgQ0GCEC4MndUX
-          jPG1TZxVKg+HutAwCQYFKw4DAh0FAAOBgQABU91ka7IlkXCfv4Zh2Ohwgg2yObt
-          Y3+6C/BTFGrOEBJDy+DoxJ/NuBF18w3rrrR18xE6jNKYLCQb8zUGk4QOG5Y+HT/
-          QTTFvWkiOLXcpTuhnOhXatr42FoYpDkjx2QWK+J5Q2l/Rgjgc/0ZV8U/kD8UuRk
-          Xp4AZh7QsiX8AcO0w==
-        </ds:X509Certificate>
-        <ds:X509Certificate>
-          MIIB9zCCAWSgAwIBAgIQLgyd1ReM8bVNnFUqD4e60DAJBgUrDgMCHQUAMBIxEDA
-          OBgNVBAMTB1Rlc3QgQ0EwHhcNMDMwODE1MDcwMDAwWhcNMTAwODE1MDcwMDAwWj
-          ASMRAwDgYDVQQDEwdUZXN0IENBMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBg
-          QCn23HHp+HtXpiyKVSDtdE3dO0r0oLB/H9sxUEkeXB8oMxwbhdcizWH92zrtm1V
-          fVtxkfmwF14ZXoyDZHeZXuCOtAfz/mW6s2gmfD45TfFFVGksDGVRNK5XmKXA5sE
-          C51RCvaxzGBdGDlCuVPqX7Cq3IcZpRU1IXbi5YzGwV7j6LwIDAQABo1YwVDANBg
-          NVHQoEBjAEAwIHgDBDBgNVHQEEPDA6gBABpU6RpUssqgWYs3fukLy6oRQwEjEQM
-          A4GA1UEAxMHVGVzdCBDQYIQLgyd1ReM8bVNnFUqD4e60DAJBgUrDgMCHQUAA4GB
-          ABDYD4Fwx2dscu+BgYcZ+GoQQtCJkwJEXytb4zlNl7HLFKbXSw4m0blQquIsfsi
-          QgFYAQBXSbu7aeUqqmSGHvILu3BGwVOKjxbHfcM4/MefuTtpOpCN40wy3YwwngD
-          tHTaIqm8NwS966PE+W9f8kD70q5FNwf+GF/lX9qGc/x435
-        </ds:X509Certificate>
-      </ds:X509Data>
-    </ds:KeyInfo>
-    <KeyUsage>http://www.w3.org/2002/03/xkms#Signature</KeyUsage>
-    <KeyUsage>http://www.w3.org/2002/03/xkms#Encryption</KeyUsage>
-    <KeyUsage>http://www.w3.org/2002/03/xkms#Exchange</KeyUsage>
-    <UseKeyWith Application="urn:ietf:rfc:2459" Identifier='C="US"
+    xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" Id="I92ed24772e43843b3d23020ad9ec9754"
+    Service="http://www.example.org/XKMS" ResultMajor="http://www.w3.org/2002/03/xkms#Success"
+    RequestId="I1494ac4351b7de5c174d455b7000e18f" xmlns="http://www.w3.org/2002/03/xkms#">
+    <KeyBinding Id="Ia26450ebe93f62b3b3ab137fc6a61c36">
+        <ds:KeyInfo>
+            <ds:X509Data>
+                <ds:X509Certificate>
+                    MIICEDCCAX2gAwIBAgIQimXeUAxYJbJMady9vV1bLjAJBgUrDgMCHQUAMBIxEDA
+                    OBgNVBAMTB1Rlc3QgQ0EwHhcNMDMwODE1MDcwMDAwWhcNMDUwODE1MDY1OTU5Wj
+                    ArMSkwJwYDVQQDEyBBbGljZSBBYXJkdmFyayBPPUFsaWNlIENvcnAgQz1VUzCBn
+                    zANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA0nIsmR+aVW2egl5MIfOKy4HuMKkk
+                    9AZ/IQuDLVPlhzOfgngjVQCjr8uvmnqtNu8HBupui8LgGthO6U9D0CNT5mbmhIA
+                    ErRADUMIAFsi7LzBarUvNWTqYNEJmcHsAUZdrdcDrkNnG7SzbuJx+GDNiHKVDQg
+                    gPBLc1XagW20RMvokCAwEAAaNWMFQwDQYDVR0KBAYwBAMCBkAwQwYDVR0BBDwwO
+                    oAQAaVOkaVLLKoFmLN37pC8uqEUMBIxEDAOBgNVBAMTB1Rlc3QgQ0GCEC4MndUX
+                    jPG1TZxVKg+HutAwCQYFKw4DAh0FAAOBgQABU91ka7IlkXCfv4Zh2Ohwgg2yObt
+                    Y3+6C/BTFGrOEBJDy+DoxJ/NuBF18w3rrrR18xE6jNKYLCQb8zUGk4QOG5Y+HT/
+                    QTTFvWkiOLXcpTuhnOhXatr42FoYpDkjx2QWK+J5Q2l/Rgjgc/0ZV8U/kD8UuRk
+                    Xp4AZh7QsiX8AcO0w==
+                </ds:X509Certificate>
+                <ds:X509Certificate>
+                    MIIB9zCCAWSgAwIBAgIQLgyd1ReM8bVNnFUqD4e60DAJBgUrDgMCHQUAMBIxEDA
+                    OBgNVBAMTB1Rlc3QgQ0EwHhcNMDMwODE1MDcwMDAwWhcNMTAwODE1MDcwMDAwWj
+                    ASMRAwDgYDVQQDEwdUZXN0IENBMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBg
+                    QCn23HHp+HtXpiyKVSDtdE3dO0r0oLB/H9sxUEkeXB8oMxwbhdcizWH92zrtm1V
+                    fVtxkfmwF14ZXoyDZHeZXuCOtAfz/mW6s2gmfD45TfFFVGksDGVRNK5XmKXA5sE
+                    C51RCvaxzGBdGDlCuVPqX7Cq3IcZpRU1IXbi5YzGwV7j6LwIDAQABo1YwVDANBg
+                    NVHQoEBjAEAwIHgDBDBgNVHQEEPDA6gBABpU6RpUssqgWYs3fukLy6oRQwEjEQM
+                    A4GA1UEAxMHVGVzdCBDQYIQLgyd1ReM8bVNnFUqD4e60DAJBgUrDgMCHQUAA4GB
+                    ABDYD4Fwx2dscu+BgYcZ+GoQQtCJkwJEXytb4zlNl7HLFKbXSw4m0blQquIsfsi
+                    QgFYAQBXSbu7aeUqqmSGHvILu3BGwVOKjxbHfcM4/MefuTtpOpCN40wy3YwwngD
+                    tHTaIqm8NwS966PE+W9f8kD70q5FNwf+GF/lX9qGc/x435
+                </ds:X509Certificate>
+            </ds:X509Data>
+        </ds:KeyInfo>
+        <KeyUsage>http://www.w3.org/2002/03/xkms#Signature</KeyUsage>
+        <KeyUsage>http://www.w3.org/2002/03/xkms#Encryption</KeyUsage>
+        <KeyUsage>http://www.w3.org/2002/03/xkms#Exchange</KeyUsage>
+        <UseKeyWith Application="urn:ietf:rfc:2459"
+            Identifier='C="US"
           O="Alice Corp" CN="Alice Aardvark"' />
-    <UseKeyWith Application="urn:ietf:rfc:2633"
-          Identifier="alice@example.com" />
-    <UseKeyWith Application="http://ca.example.com/cps/20030401/class3"
-          Identifier="alice@example.com" />
-    <Status StatusValue="http://www.w3.org/2002/03/xkms#Valid">
-      <ValidReason>http://www.w3.org/2002/03/xkms#Signature</ValidReason>
-      <ValidReason>http://www.w3.org/2002/03/xkms#IssuerTrust</ValidReason>
-      <ValidReason>http://www.w3.org/2002/03/xkms#RevocationStatus</ValidReason>
-      <ValidReason>http://www.w3.org/2002/03/xkms#ValidityInterval</ValidReason>
-    </Status>
-  </KeyBinding>
+        <UseKeyWith Application="urn:ietf:rfc:2633"
+            Identifier="alice@example.com" />
+        <UseKeyWith Application="http://ca.example.com/cps/20030401/class3"
+            Identifier="alice@example.com" />
+        <Status StatusValue="http://www.w3.org/2002/03/xkms#Valid">
+            <ValidReason>http://www.w3.org/2002/03/xkms#Signature
+            </ValidReason>
+            <ValidReason>http://www.w3.org/2002/03/xkms#IssuerTrust
+            </ValidReason>
+            <ValidReason>http://www.w3.org/2002/03/xkms#RevocationStatus
+            </ValidReason>
+            <ValidReason>http://www.w3.org/2002/03/xkms#ValidityInterval
+            </ValidReason>
+        </Status>
+    </KeyBinding>
 </RegisterResult>
\ No newline at end of file

Modified: cxf/trunk/services/xkms/xkms-x509-handlers/src/test/resources/reissueRequest.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/services/xkms/xkms-x509-handlers/src/test/resources/reissueRequest.xml?rev=1484794&r1=1484793&r2=1484794&view=diff
==============================================================================
--- cxf/trunk/services/xkms/xkms-x509-handlers/src/test/resources/reissueRequest.xml (original)
+++ cxf/trunk/services/xkms/xkms-x509-handlers/src/test/resources/reissueRequest.xml Tue May 21 13:13:08 2013
@@ -1,80 +1,85 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ReissueRequest xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-      xmlns:xenc="http://www.w3.org/2001/04/xmlenc#"
-      Id="I3a682dfb94cc8e9b3b648026783a8094"
-      Service="http://www.example.org/XKMS"
-      xmlns="http://www.w3.org/2002/03/xkms#">
-  <RespondWith>http://www.w3.org/2002/03/xkms#X509Cert</RespondWith>
-  <RespondWith>http://www.w3.org/2002/03/xkms#X509Chain</RespondWith>
-  <ReissueKeyBinding Id="I518fc89b03369bccec3d1ee9d985c436">
-    <ds:KeyInfo>
-      <ds:X509Data>
-        <ds:X509Certificate>
-          MIICEDCCAX2gAwIBAgIQimXeUAxYJbJMady9vV1bLjAJBgUrDgMCHQUAMBIxEDA
-          OBgNVBAMTB1Rlc3QgQ0EwHhcNMDMwODE1MDcwMDAwWhcNMDUwODE1MDY1OTU5Wj
-          ArMSkwJwYDVQQDEyBBbGljZSBBYXJkdmFyayBPPUFsaWNlIENvcnAgQz1VUzCBn
-          zANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA0nIsmR+aVW2egl5MIfOKy4HuMKkk
-          9AZ/IQuDLVPlhzOfgngjVQCjr8uvmnqtNu8HBupui8LgGthO6U9D0CNT5mbmhIA
-          ErRADUMIAFsi7LzBarUvNWTqYNEJmcHsAUZdrdcDrkNnG7SzbuJx+GDNiHKVDQg
-          gPBLc1XagW20RMvokCAwEAAaNWMFQwDQYDVR0KBAYwBAMCBkAwQwYDVR0BBDwwO
-          oAQAaVOkaVLLKoFmLN37pC8uqEUMBIxEDAOBgNVBAMTB1Rlc3QgQ0GCEC4MndUX
-          jPG1TZxVKg+HutAwCQYFKw4DAh0FAAOBgQABU91ka7IlkXCfv4Zh2Ohwgg2yObt
-          Y3+6C/BTFGrOEBJDy+DoxJ/NuBF18w3rrrR18xE6jNKYLCQb8zUGk4QOG5Y+HT/
-          QTTFvWkiOLXcpTuhnOhXatr42FoYpDkjx2QWK+J5Q2l/Rgjgc/0ZV8U/kD8UuRk
-          Xp4AZh7QsiX8AcO0w==
-        </ds:X509Certificate>
-      </ds:X509Data>
-    </ds:KeyInfo>
-    <Status StatusValue="http://www.w3.org/2002/03/xkms#Valid" />
-  </ReissueKeyBinding>
-  <Authentication>
-    <KeyBindingAuthentication>
-      <Signature xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <SignedInfo>
-          <CanonicalizationMethod
-                Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
-          <SignatureMethod
-                Algorithm="http://www.w3.org/2000/09/xmldsig#hmac-sha1" />
-          <Reference URI="#I518fc89b03369bccec3d1ee9d985c436">
-            <Transforms>
-              <Transform
-                    Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#">
-                <ec:InclusiveNamespaces PrefixList="ds xenc #default"
-                      xmlns:ec="http://www.w3.org/2001/10/xml-exc-c14n#" />
-              </Transform>
-            </Transforms>
-            <DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-            <DigestValue>qnhsUF9RMxxGydG/5KdJjWhtBFE=</DigestValue>
-          </Reference>
-        </SignedInfo>
-        <SignatureValue>+gKw3b0qi9BaIqmN1gIyvj1UxRs=</SignatureValue>
-      </Signature>
-    </KeyBindingAuthentication>
-  </Authentication>
-  <ProofOfPossession>
-    <Signature xmlns="http://www.w3.org/2000/09/xmldsig#">
-      <SignedInfo>
-        <CanonicalizationMethod
-              Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
-        <SignatureMethod
-              Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1" />
-        <Reference URI="#I518fc89b03369bccec3d1ee9d985c436">
-          <Transforms>
-            <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#">
-              <ec:InclusiveNamespaces PrefixList="ds xenc #default"
-                    xmlns:ec="http://www.w3.org/2001/10/xml-exc-c14n#" />
-            </Transform>
-          </Transforms>
-          <DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"
-                />
-          <DigestValue>qnhsUF9RMxxGydG/5KdJjWhtBFE=</DigestValue>
-        </Reference>
-      </SignedInfo>
-      <SignatureValue>
-sP/RWAA7fnv86ZgwOlfxTwN05akxyf65rCw7rwXNkJmx0fxUNFJ+qKDqmIh2KyvFyBut6FredSXj
-t3iDIXUKMmjA2/VPGEX8yyd71DbRqf9dXb2FzkvkKrCbYumlavbrChpEwiMUqk2rd5tjkFAZjYRA
-tuURoFfmoOYY/M+mNUU=
-      </SignatureValue>
-    </Signature>
-  </ProofOfPossession>
+    xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" Id="I3a682dfb94cc8e9b3b648026783a8094"
+    Service="http://www.example.org/XKMS" xmlns="http://www.w3.org/2002/03/xkms#">
+    <RespondWith>http://www.w3.org/2002/03/xkms#X509Cert</RespondWith>
+    <RespondWith>http://www.w3.org/2002/03/xkms#X509Chain</RespondWith>
+    <ReissueKeyBinding Id="I518fc89b03369bccec3d1ee9d985c436">
+        <ds:KeyInfo>
+            <ds:X509Data>
+                <ds:X509Certificate>
+                    MIICEDCCAX2gAwIBAgIQimXeUAxYJbJMady9vV1bLjAJBgUrDgMCHQUAMBIxEDA
+                    OBgNVBAMTB1Rlc3QgQ0EwHhcNMDMwODE1MDcwMDAwWhcNMDUwODE1MDY1OTU5Wj
+                    ArMSkwJwYDVQQDEyBBbGljZSBBYXJkdmFyayBPPUFsaWNlIENvcnAgQz1VUzCBn
+                    zANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA0nIsmR+aVW2egl5MIfOKy4HuMKkk
+                    9AZ/IQuDLVPlhzOfgngjVQCjr8uvmnqtNu8HBupui8LgGthO6U9D0CNT5mbmhIA
+                    ErRADUMIAFsi7LzBarUvNWTqYNEJmcHsAUZdrdcDrkNnG7SzbuJx+GDNiHKVDQg
+                    gPBLc1XagW20RMvokCAwEAAaNWMFQwDQYDVR0KBAYwBAMCBkAwQwYDVR0BBDwwO
+                    oAQAaVOkaVLLKoFmLN37pC8uqEUMBIxEDAOBgNVBAMTB1Rlc3QgQ0GCEC4MndUX
+                    jPG1TZxVKg+HutAwCQYFKw4DAh0FAAOBgQABU91ka7IlkXCfv4Zh2Ohwgg2yObt
+                    Y3+6C/BTFGrOEBJDy+DoxJ/NuBF18w3rrrR18xE6jNKYLCQb8zUGk4QOG5Y+HT/
+                    QTTFvWkiOLXcpTuhnOhXatr42FoYpDkjx2QWK+J5Q2l/Rgjgc/0ZV8U/kD8UuRk
+                    Xp4AZh7QsiX8AcO0w==
+                </ds:X509Certificate>
+            </ds:X509Data>
+        </ds:KeyInfo>
+        <Status StatusValue="http://www.w3.org/2002/03/xkms#Valid" />
+    </ReissueKeyBinding>
+    <Authentication>
+        <KeyBindingAuthentication>
+            <Signature xmlns="http://www.w3.org/2000/09/xmldsig#">
+                <SignedInfo>
+                    <CanonicalizationMethod
+                        Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+                    <SignatureMethod
+                        Algorithm="http://www.w3.org/2000/09/xmldsig#hmac-sha1" />
+                    <Reference URI="#I518fc89b03369bccec3d1ee9d985c436">
+                        <Transforms>
+                            <Transform
+                                Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#">
+                                <ec:InclusiveNamespaces
+                                    PrefixList="ds xenc #default"
+                                    xmlns:ec="http://www.w3.org/2001/10/xml-exc-c14n#" />
+                            </Transform>
+                        </Transforms>
+                        <DigestMethod
+                            Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
+                        <DigestValue>qnhsUF9RMxxGydG/5KdJjWhtBFE=
+                        </DigestValue>
+                    </Reference>
+                </SignedInfo>
+                <SignatureValue>+gKw3b0qi9BaIqmN1gIyvj1UxRs=
+                </SignatureValue>
+            </Signature>
+        </KeyBindingAuthentication>
+    </Authentication>
+    <ProofOfPossession>
+        <Signature xmlns="http://www.w3.org/2000/09/xmldsig#">
+            <SignedInfo>
+                <CanonicalizationMethod
+                    Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+                <SignatureMethod
+                    Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1" />
+                <Reference URI="#I518fc89b03369bccec3d1ee9d985c436">
+                    <Transforms>
+                        <Transform
+                            Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#">
+                            <ec:InclusiveNamespaces
+                                PrefixList="ds xenc #default"
+                                xmlns:ec="http://www.w3.org/2001/10/xml-exc-c14n#" />
+                        </Transform>
+                    </Transforms>
+                    <DigestMethod
+                        Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
+                    <DigestValue>qnhsUF9RMxxGydG/5KdJjWhtBFE=
+                    </DigestValue>
+                </Reference>
+            </SignedInfo>
+            <SignatureValue>
+                sP/RWAA7fnv86ZgwOlfxTwN05akxyf65rCw7rwXNkJmx0fxUNFJ+qKDqmIh2KyvFyBut6FredSXj
+                t3iDIXUKMmjA2/VPGEX8yyd71DbRqf9dXb2FzkvkKrCbYumlavbrChpEwiMUqk2rd5tjkFAZjYRA
+                tuURoFfmoOYY/M+mNUU=
+            </SignatureValue>
+        </Signature>
+    </ProofOfPossession>
 </ReissueRequest>
\ No newline at end of file

Modified: cxf/trunk/services/xkms/xkms-x509-handlers/src/test/resources/revokeRequest.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/services/xkms/xkms-x509-handlers/src/test/resources/revokeRequest.xml?rev=1484794&r1=1484793&r2=1484794&view=diff
==============================================================================
--- cxf/trunk/services/xkms/xkms-x509-handlers/src/test/resources/revokeRequest.xml (original)
+++ cxf/trunk/services/xkms/xkms-x509-handlers/src/test/resources/revokeRequest.xml Tue May 21 13:13:08 2013
@@ -1,29 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RevokeRequest xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-      xmlns:xenc="http://www.w3.org/2001/04/xmlenc#"
-      Id="I2aa2c2f37195c9c4364c55f15df68091"
-      Service="http://www.example.org/XKMS"
-      xmlns="http://www.w3.org/2002/03/xkms#">
-  <RevokeKeyBinding Id="Ie91dfbf1c948d5cf142099676968caf1">
-    <ds:KeyInfo>
-      <ds:X509Data>
-        <ds:X509Certificate>
-          MIICEDCCAX2gAwIBAgIQimXeUAxYJbJMady9vV1bLjAJBgUrDgMCHQUAMBIxEDA
-          OBgNVBAMTB1Rlc3QgQ0EwHhcNMDMwODE1MDcwMDAwWhcNMDUwODE1MDY1OTU5Wj
-          ArMSkwJwYDVQQDEyBBbGljZSBBYXJkdmFyayBPPUFsaWNlIENvcnAgQz1VUzCBn
-          zANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA0nIsmR+aVW2egl5MIfOKy4HuMKkk
-          9AZ/IQuDLVPlhzOfgngjVQCjr8uvmnqtNu8HBupui8LgGthO6U9D0CNT5mbmhIA
-          ErRADUMIAFsi7LzBarUvNWTqYNEJmcHsAUZdrdcDrkNnG7SzbuJx+GDNiHKVDQg
-          gPBLc1XagW20RMvokCAwEAAaNWMFQwDQYDVR0KBAYwBAMCBkAwQwYDVR0BBDwwO
-          oAQAaVOkaVLLKoFmLN37pC8uqEUMBIxEDAOBgNVBAMTB1Rlc3QgQ0GCEC4MndUX
-          jPG1TZxVKg+HutAwCQYFKw4DAh0FAAOBgQABU91ka7IlkXCfv4Zh2Ohwgg2yObt
-          Y3+6C/BTFGrOEBJDy+DoxJ/NuBF18w3rrrR18xE6jNKYLCQb8zUGk4QOG5Y+HT/
-          QTTFvWkiOLXcpTuhnOhXatr42FoYpDkjx2QWK+J5Q2l/Rgjgc/0ZV8U/kD8UuRk
-          Xp4AZh7QsiX8AcO0w==
-        </ds:X509Certificate>
-      </ds:X509Data>
-    </ds:KeyInfo>
-    <Status StatusValue="http://www.w3.org/2002/03/xkms#Indeterminate" />
-  </RevokeKeyBinding>
-  <RevocationCode>PHx8li2SUhrJv2e1DyeWbGbD6rs=</RevocationCode>
+    xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" Id="I2aa2c2f37195c9c4364c55f15df68091"
+    Service="http://www.example.org/XKMS" xmlns="http://www.w3.org/2002/03/xkms#">
+    <RevokeKeyBinding Id="Ie91dfbf1c948d5cf142099676968caf1">
+        <ds:KeyInfo>
+            <ds:X509Data>
+                <ds:X509Certificate>
+                    MIICEDCCAX2gAwIBAgIQimXeUAxYJbJMady9vV1bLjAJBgUrDgMCHQUAMBIxEDA
+                    OBgNVBAMTB1Rlc3QgQ0EwHhcNMDMwODE1MDcwMDAwWhcNMDUwODE1MDY1OTU5Wj
+                    ArMSkwJwYDVQQDEyBBbGljZSBBYXJkdmFyayBPPUFsaWNlIENvcnAgQz1VUzCBn
+                    zANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA0nIsmR+aVW2egl5MIfOKy4HuMKkk
+                    9AZ/IQuDLVPlhzOfgngjVQCjr8uvmnqtNu8HBupui8LgGthO6U9D0CNT5mbmhIA
+                    ErRADUMIAFsi7LzBarUvNWTqYNEJmcHsAUZdrdcDrkNnG7SzbuJx+GDNiHKVDQg
+                    gPBLc1XagW20RMvokCAwEAAaNWMFQwDQYDVR0KBAYwBAMCBkAwQwYDVR0BBDwwO
+                    oAQAaVOkaVLLKoFmLN37pC8uqEUMBIxEDAOBgNVBAMTB1Rlc3QgQ0GCEC4MndUX
+                    jPG1TZxVKg+HutAwCQYFKw4DAh0FAAOBgQABU91ka7IlkXCfv4Zh2Ohwgg2yObt
+                    Y3+6C/BTFGrOEBJDy+DoxJ/NuBF18w3rrrR18xE6jNKYLCQb8zUGk4QOG5Y+HT/
+                    QTTFvWkiOLXcpTuhnOhXatr42FoYpDkjx2QWK+J5Q2l/Rgjgc/0ZV8U/kD8UuRk
+                    Xp4AZh7QsiX8AcO0w==
+                </ds:X509Certificate>
+            </ds:X509Data>
+        </ds:KeyInfo>
+        <Status StatusValue="http://www.w3.org/2002/03/xkms#Indeterminate" />
+    </RevokeKeyBinding>
+    <RevocationCode>PHx8li2SUhrJv2e1DyeWbGbD6rs=</RevocationCode>
 </RevokeRequest>

Modified: cxf/trunk/services/xkms/xkms-x509-handlers/src/test/resources/validateRequestExpired.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/services/xkms/xkms-x509-handlers/src/test/resources/validateRequestExpired.xml?rev=1484794&r1=1484793&r2=1484794&view=diff
==============================================================================
--- cxf/trunk/services/xkms/xkms-x509-handlers/src/test/resources/validateRequestExpired.xml (original)
+++ cxf/trunk/services/xkms/xkms-x509-handlers/src/test/resources/validateRequestExpired.xml Tue May 21 13:13:08 2013
@@ -4,7 +4,8 @@
     <ns2:QueryKeyBinding>
         <KeyInfo>
             <X509Data>
-                <X509Certificate>MIIDETCCAs+gAwIBAgIEULOjdjALBgcqhkjOOAQDBQAwbDEQMA4GA1UEBhMHVW5rbm93bjEQMA4GA1UECBMHVW5rbm93bjEQMA4GA1UEBxMHVW5rbm93bjEQMA4GA1UEChMHVW5rbm93bjEQMA4GA1UECxMHVW5rbm93bjEQMA4GA1UEAxMHVW5rbm93bjAeFw0xMjExMjYxNzE0MzBaFw0xMjExMjcxNzE0MzBaMGwxEDAOBgNVBAYTB1Vua25vd24xEDAOBgNVBAgTB1Vua25vd24xEDAOBgNVBAcTB1Vua25vd24xEDAOBgNVBAoTB1Vua25vd24xEDAOBgNVBAsTB1Vua25vd24xEDAOBgNVBAMTB1Vua25vd24wggG3MIIBLAYHKoZIzjgEATCCAR8CgYEA/X9TgR11EilS30qcLuzk5/YRt1I870QAwx4/gLZRJmlFXUAiUftZPY1Y+r/F9bow9subVWzXgTuAHTRv8mZgt2uZUKWkn5/oBHsQIsJPu6nX/rfGG/g7V+fGqKYVDwT7g/bTxR7DAjVUE1oWkTL2dfOuK2HXKu/yIgMZndFIAccCFQCXYFCPFSMLzLKSuYKi64QL8Fgc9QKBgQD34aCF1ps93su8q1w2uFe5eZSvu/o66oL5V0wLPQeCZ1FZV4661FlP5nEHEIGAtEkWcSPoTCgWE7fPCTKMyKbhPBZ6i1R8jSjgo64eK7OmdZFuo38L+iE1YvH7YnoBJDvMpPG+qFGQiaiD3+Fa5Z8GkotmXoB7VSVkAUw7/s9JKgOBhAACgYAsPxaTY+hEmXhYaKDXWDWLqrVl+rGb9IZvP9rkR5la8bQ44e8hMmUg+M8HmamCdyO8YAjGEcRGvrR+ztdAdltspfedBkfJJ52nQu7NNWGq72Q+Z2MRMOSPvhtgOx0zlXWyyU1zOSXLaoaaojmplZrWfCgJFKk8
 rvyD82zTQRil0DALBgcqhkjOOAQDBQADLwAwLAIUJiMH3APdS6pwQg8WBKvPOP/yZ+8CFEVErmoasRYXeJfZf+nl9gPEzIdt</X509Certificate>
+                <X509Certificate>MIIDETCCAs+gAwIBAgIEULOjdjALBgcqhkjOOAQDBQAwbDEQMA4GA1UEBhMHVW5rbm93bjEQMA4GA1UECBMHVW5rbm93bjEQMA4GA1UEBxMHVW5rbm93bjEQMA4GA1UEChMHVW5rbm93bjEQMA4GA1UECxMHVW5rbm93bjEQMA4GA1UEAxMHVW5rbm93bjAeFw0xMjExMjYxNzE0MzBaFw0xMjExMjcxNzE0MzBaMGwxEDAOBgNVBAYTB1Vua25vd24xEDAOBgNVBAgTB1Vua25vd24xEDAOBgNVBAcTB1Vua25vd24xEDAOBgNVBAoTB1Vua25vd24xEDAOBgNVBAsTB1Vua25vd24xEDAOBgNVBAMTB1Vua25vd24wggG3MIIBLAYHKoZIzjgEATCCAR8CgYEA/X9TgR11EilS30qcLuzk5/YRt1I870QAwx4/gLZRJmlFXUAiUftZPY1Y+r/F9bow9subVWzXgTuAHTRv8mZgt2uZUKWkn5/oBHsQIsJPu6nX/rfGG/g7V+fGqKYVDwT7g/bTxR7DAjVUE1oWkTL2dfOuK2HXKu/yIgMZndFIAccCFQCXYFCPFSMLzLKSuYKi64QL8Fgc9QKBgQD34aCF1ps93su8q1w2uFe5eZSvu/o66oL5V0wLPQeCZ1FZV4661FlP5nEHEIGAtEkWcSPoTCgWE7fPCTKMyKbhPBZ6i1R8jSjgo64eK7OmdZFuo38L+iE1YvH7YnoBJDvMpPG+qFGQiaiD3+Fa5Z8GkotmXoB7VSVkAUw7/s9JKgOBhAACgYAsPxaTY+hEmXhYaKDXWDWLqrVl+rGb9IZvP9rkR5la8bQ44e8hMmUg+M8HmamCdyO8YAjGEcRGvrR+ztdAdltspfedBkfJJ52nQu7NNWGq72Q+Z2MRMOSPvhtgOx0zlXWyyU1zOSXLaoaaojmplZrWfCgJFKk8
 rvyD82zTQRil0DALBgcqhkjOOAQDBQADLwAwLAIUJiMH3APdS6pwQg8WBKvPOP/yZ+8CFEVErmoasRYXeJfZf+nl9gPEzIdt
+                </X509Certificate>
             </X509Data>
         </KeyInfo>
     </ns2:QueryKeyBinding>

Modified: cxf/trunk/services/xkms/xkms-x509-handlers/src/test/resources/validateRequestOK.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/services/xkms/xkms-x509-handlers/src/test/resources/validateRequestOK.xml?rev=1484794&r1=1484793&r2=1484794&view=diff
==============================================================================
--- cxf/trunk/services/xkms/xkms-x509-handlers/src/test/resources/validateRequestOK.xml (original)
+++ cxf/trunk/services/xkms/xkms-x509-handlers/src/test/resources/validateRequestOK.xml Tue May 21 13:13:08 2013
@@ -4,7 +4,8 @@
     <ns2:QueryKeyBinding>
         <KeyInfo>
             <X509Data>
-                <X509Certificate>MIIEFjCCA3+gAwIBAgIJAJORWX2Xsa8DMA0GCSqGSIb3DQEBBQUAMIG5MQswCQYDVQQGEwJVUzERMA8GA1UECBMITmV3IFlvcmsxFjAUBgNVBAcTDU5pYWdhcmEgRmFsbHMxLDAqBgNVBAoTI1NhbXBsZSBDbGllbnQgLS0gTk9UIEZPUiBQUk9EVUNUSU9OMRYwFAYDVQQLEw1JVCBEZXBhcnRtZW50MRcwFQYDVQQDEw53d3cuY2xpZW50LmNvbTEgMB4GCSqGSIb3DQEJARYRY2xpZW50QGNsaWVudC5jb20wHhcNMTEwMjA5MTgzMDI3WhcNMjEwMjA2MTgzMDI3WjCBuTELMAkGA1UEBhMCVVMxETAPBgNVBAgTCE5ldyBZb3JrMRYwFAYDVQQHEw1OaWFnYXJhIEZhbGxzMSwwKgYDVQQKEyNTYW1wbGUgQ2xpZW50IC0tIE5PVCBGT1IgUFJPRFVDVElPTjEWMBQGA1UECxMNSVQgRGVwYXJ0bWVudDEXMBUGA1UEAxMOd3d3LmNsaWVudC5jb20xIDAeBgkqhkiG9w0BCQEWEWNsaWVudEBjbGllbnQuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDauFNVqi4B2+u/PC9ktDkn82bglEQYcL4o5JRUhQVEhTK2iEloz1Rvo/qyfDhBPc1lzIUn4ams+DKBSSjZMCgop3XbeCXzIVP784ruC8HF5QrYsXUQfTc7lzqafXZXH8Bk89gSScA1fFme6TpvYzM0zjBETSXADtKOs9oKB2VOIwIDAQABo4IBIjCCAR4wHQYDVR0OBBYEFFIz+0BSZlLtXkA/udRjRgphtREuMIHuBgNVHSMEgeYwgeOAFFIz+0BSZlLtXkA/udRjRgphtREuoYG/pIG8MIG5MQswCQYDVQQGEwJVUzERMA8GA1UECBMI
 TmV3IFlvcmsxFjAUBgNVBAcTDU5pYWdhcmEgRmFsbHMxLDAqBgNVBAoTI1NhbXBsZSBDbGllbnQgLS0gTk9UIEZPUiBQUk9EVUNUSU9OMRYwFAYDVQQLEw1JVCBEZXBhcnRtZW50MRcwFQYDVQQDEw53d3cuY2xpZW50LmNvbTEgMB4GCSqGSIb3DQEJARYRY2xpZW50QGNsaWVudC5jb22CCQCTkVl9l7GvAzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAEjEr9QfaYsZf7ELnqB++OkWcKxpMt1Yj/VOyL99AekkVTM+rRHCU9Bu+tncMNsfy8mIXUC1JqKQ+Cq5RlaDh/ujzt6i17G7uSGd6U1U/DPZBqTm3Dxwl1cMAGU/CoAKTWE+o+fS4Q2xHv7L1KiXQQc9EWJ4C34Ik45fB6g3DiTj</X509Certificate>
+                <X509Certificate>MIIEFjCCA3+gAwIBAgIJAJORWX2Xsa8DMA0GCSqGSIb3DQEBBQUAMIG5MQswCQYDVQQGEwJVUzERMA8GA1UECBMITmV3IFlvcmsxFjAUBgNVBAcTDU5pYWdhcmEgRmFsbHMxLDAqBgNVBAoTI1NhbXBsZSBDbGllbnQgLS0gTk9UIEZPUiBQUk9EVUNUSU9OMRYwFAYDVQQLEw1JVCBEZXBhcnRtZW50MRcwFQYDVQQDEw53d3cuY2xpZW50LmNvbTEgMB4GCSqGSIb3DQEJARYRY2xpZW50QGNsaWVudC5jb20wHhcNMTEwMjA5MTgzMDI3WhcNMjEwMjA2MTgzMDI3WjCBuTELMAkGA1UEBhMCVVMxETAPBgNVBAgTCE5ldyBZb3JrMRYwFAYDVQQHEw1OaWFnYXJhIEZhbGxzMSwwKgYDVQQKEyNTYW1wbGUgQ2xpZW50IC0tIE5PVCBGT1IgUFJPRFVDVElPTjEWMBQGA1UECxMNSVQgRGVwYXJ0bWVudDEXMBUGA1UEAxMOd3d3LmNsaWVudC5jb20xIDAeBgkqhkiG9w0BCQEWEWNsaWVudEBjbGllbnQuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDauFNVqi4B2+u/PC9ktDkn82bglEQYcL4o5JRUhQVEhTK2iEloz1Rvo/qyfDhBPc1lzIUn4ams+DKBSSjZMCgop3XbeCXzIVP784ruC8HF5QrYsXUQfTc7lzqafXZXH8Bk89gSScA1fFme6TpvYzM0zjBETSXADtKOs9oKB2VOIwIDAQABo4IBIjCCAR4wHQYDVR0OBBYEFFIz+0BSZlLtXkA/udRjRgphtREuMIHuBgNVHSMEgeYwgeOAFFIz+0BSZlLtXkA/udRjRgphtREuoYG/pIG8MIG5MQswCQYDVQQGEwJVUzERMA8GA1UECBMI
 TmV3IFlvcmsxFjAUBgNVBAcTDU5pYWdhcmEgRmFsbHMxLDAqBgNVBAoTI1NhbXBsZSBDbGllbnQgLS0gTk9UIEZPUiBQUk9EVUNUSU9OMRYwFAYDVQQLEw1JVCBEZXBhcnRtZW50MRcwFQYDVQQDEw53d3cuY2xpZW50LmNvbTEgMB4GCSqGSIb3DQEJARYRY2xpZW50QGNsaWVudC5jb22CCQCTkVl9l7GvAzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAEjEr9QfaYsZf7ELnqB++OkWcKxpMt1Yj/VOyL99AekkVTM+rRHCU9Bu+tncMNsfy8mIXUC1JqKQ+Cq5RlaDh/ujzt6i17G7uSGd6U1U/DPZBqTm3Dxwl1cMAGU/CoAKTWE+o+fS4Q2xHv7L1KiXQQc9EWJ4C34Ik45fB6g3DiTj
+                </X509Certificate>
             </X509Data>
         </KeyInfo>
     </ns2:QueryKeyBinding>



Mime
View raw message