cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ashaki...@apache.org
Subject svn commit: r1484794 [1/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
Author: ashakirin
Date: Tue May 21 13:13:08 2013
New Revision: 1484794

URL: http://svn.apache.org/r1484794
Log:
Fixed XML formatting issue in [CXF-5001]

Removed:
    cxf/trunk/services/xkms/xkms-itests/src/test/resources/XKMS-soapui-project.xml
    cxf/trunk/services/xkms/xkms-osgi/src/main/resources/test-requests/
Modified:
    cxf/trunk/services/xkms/xkms-client/pom.xml
    cxf/trunk/services/xkms/xkms-client/src/main/resources/OSGI-INF/blueprint/beans.xml
    cxf/trunk/services/xkms/xkms-common/pom.xml
    cxf/trunk/services/xkms/xkms-features/pom.xml
    cxf/trunk/services/xkms/xkms-features/src/main/resources/features.xml
    cxf/trunk/services/xkms/xkms-itests/pom.xml
    cxf/trunk/services/xkms/xkms-osgi/pom.xml
    cxf/trunk/services/xkms/xkms-osgi/src/main/resources/OSGI-INF/blueprint/cxf-endpoint.xml
    cxf/trunk/services/xkms/xkms-osgi/src/main/resources/OSGI-INF/blueprint/xkms-key-handlers.xml
    cxf/trunk/services/xkms/xkms-osgi/src/test/resources/test-requests/request-locate.xml
    cxf/trunk/services/xkms/xkms-osgi/src/test/resources/test-requests/request-validate.xml
    cxf/trunk/services/xkms/xkms-osgi/src/test/resources/test-requests/response-locate.xml
    cxf/trunk/services/xkms/xkms-osgi/src/test/resources/test-requests/response-validate.xml
    cxf/trunk/services/xkms/xkms-service/pom.xml
    cxf/trunk/services/xkms/xkms-war/pom.xml
    cxf/trunk/services/xkms/xkms-war/src/main/webapp/WEB-INF/cxf-servlet.xml
    cxf/trunk/services/xkms/xkms-war/src/main/webapp/WEB-INF/web.xml
    cxf/trunk/services/xkms/xkms-war/src/main/webapp/WEB-INF/xkms-endpoint.xml
    cxf/trunk/services/xkms/xkms-war/src/main/webapp/WEB-INF/xkms-key-handlers.xml
    cxf/trunk/services/xkms/xkms-x509-handlers/pom.xml
    cxf/trunk/services/xkms/xkms-x509-handlers/src/test/resources/registerRequest.xml
    cxf/trunk/services/xkms/xkms-x509-handlers/src/test/resources/registerRequestWithCertificate.xml
    cxf/trunk/services/xkms/xkms-x509-handlers/src/test/resources/registerResult.xml
    cxf/trunk/services/xkms/xkms-x509-handlers/src/test/resources/reissueRequest.xml
    cxf/trunk/services/xkms/xkms-x509-handlers/src/test/resources/revokeRequest.xml
    cxf/trunk/services/xkms/xkms-x509-handlers/src/test/resources/validateRequestExpired.xml
    cxf/trunk/services/xkms/xkms-x509-handlers/src/test/resources/validateRequestOK.xml

Modified: cxf/trunk/services/xkms/xkms-client/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/services/xkms/xkms-client/pom.xml?rev=1484794&r1=1484793&r2=1484794&view=diff
==============================================================================
--- cxf/trunk/services/xkms/xkms-client/pom.xml (original)
+++ cxf/trunk/services/xkms/xkms-client/pom.xml Tue May 21 13:13:08 2013
@@ -1,61 +1,67 @@
-<?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-client</artifactId>
-	<packaging>bundle</packaging>
-	<name>Apache CXF XKMS Client</name>
-	<url>http://cxf.apache.org</url>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.apache.cxf.services.xkms</groupId>
+    <artifactId>cxf-services-xkms-client</artifactId>
+    <packaging>bundle</packaging>
+    <name>Apache CXF XKMS Client</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.services.xkms</groupId>
-			<artifactId>cxf-services-xkms-common</artifactId>
-			<version>${project.version}</version>
-		</dependency>
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.cxf.services.xkms</groupId>
+            <artifactId>cxf-services-xkms-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-api</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-        	<groupId>org.slf4j</groupId>
-        	<artifactId>slf4j-api</artifactId>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
         </dependency>
-	</dependencies>
+    </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>
-		</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>
+        </plugins>
+    </build>
 </project>

Modified: cxf/trunk/services/xkms/xkms-client/src/main/resources/OSGI-INF/blueprint/beans.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/services/xkms/xkms-client/src/main/resources/OSGI-INF/blueprint/beans.xml?rev=1484794&r1=1484793&r2=1484794&view=diff
==============================================================================
--- cxf/trunk/services/xkms/xkms-client/src/main/resources/OSGI-INF/blueprint/beans.xml (original)
+++ cxf/trunk/services/xkms/xkms-client/src/main/resources/OSGI-INF/blueprint/beans.xml Tue May 21 13:13:08 2013
@@ -1,44 +1,55 @@
-<!-- #%L ReservationService Client %% Copyright (C) 2011 - 2012 Talend Inc. 
-	%% Licensed 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. 
-	#L% -->
+<!--
+  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.
+-->
 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:cxf="http://cxf.apache.org/blueprint/core"
-	xmlns:jaxws="http://cxf.apache.org/blueprint/jaxws"
-	xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.0.0"
-	xmlns:ext="http://www.osgi.org/xmlns/blueprint-ext/v1.1.0"
-	xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0 http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:cxf="http://cxf.apache.org/blueprint/core"
+    xmlns:jaxws="http://cxf.apache.org/blueprint/jaxws"
+    xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.0.0"
+    xmlns:ext="http://www.osgi.org/xmlns/blueprint-ext/v1.1.0"
+    xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0 http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd
   						http://www.osgi.org/xmlns/blueprint-ext/v1.1.0 https://svn.apache.org/repos/asf/aries/tags/blueprint-0.3.1/blueprint-core/src/main/resources/org/apache/aries/blueprint/ext/blueprint-ext.xsd  
   						http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.0.0 http://aries.apache.org/schemas/blueprint-cm/blueprint-cm-1.0.0.xsd
   						http://cxf.apache.org/blueprint/jaxws http://cxf.apache.org/schemas/blueprint/jaxws.xsd
   						http://cxf.apache.org/blueprint/core http://cxf.apache.org/schemas/blueprint/core.xsd
-  	">
+">
 
-	<cm:property-placeholder persistent-id="tesbext.runtime">
-		<cm:default-properties>
-			<cm:property name="xkms.endpoint" value="http://localhost:8040/services/XKMS/" />
-		</cm:default-properties>
-	</cm:property-placeholder>
-	
-	<bean id="additionalClasses" class="org.apache.cxf.xkms.model.extensions.AdditionalClassesFactory"/>
-	
-	<jaxws:client id="XKMSConsumer"
-		xmlns:serviceNamespace="http://www.w3.org/2002/03/xkms#wsdl"
-		serviceClass="org.w3._2002._03.xkms_wsdl.XKMSPortType"
-		serviceName="serviceNamespace:XKMSPortType" endpointName="serviceNamespace:XKMSService"
-		address="${xkms.endpoint}">
+    <cm:property-placeholder persistent-id="tesbext.runtime">
+        <cm:default-properties>
+            <cm:property name="xkms.endpoint"
+                value="http://localhost:8040/services/XKMS/" />
+        </cm:default-properties>
+    </cm:property-placeholder>
+
+    <bean id="additionalClasses"
+        class="org.apache.cxf.xkms.model.extensions.AdditionalClassesFactory" />
+
+    <jaxws:client id="XKMSConsumer" xmlns:serviceNamespace="http://www.w3.org/2002/03/xkms#wsdl"
+        serviceClass="org.w3._2002._03.xkms_wsdl.XKMSPortType"
+        serviceName="serviceNamespace:XKMSPortType" endpointName="serviceNamespace:XKMSService"
+        address="${xkms.endpoint}">
         <jaxws:properties>
             <entry key="jaxb.additionalContextClasses">
-            	<bean class="java.lang.Object" factory-ref="additionalClasses" factory-method="create"/>
+                <bean class="java.lang.Object" factory-ref="additionalClasses"
+                    factory-method="create" />
             </entry>
         </jaxws:properties>
-	</jaxws:client>
+    </jaxws:client>
 
-	<service ref="XKMSConsumer" interface="org.w3._2002._03.xkms_wsdl.XKMSPortType" />
+    <service ref="XKMSConsumer" interface="org.w3._2002._03.xkms_wsdl.XKMSPortType" />
 
 </blueprint>

Modified: cxf/trunk/services/xkms/xkms-common/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/services/xkms/xkms-common/pom.xml?rev=1484794&r1=1484793&r2=1484794&view=diff
==============================================================================
--- cxf/trunk/services/xkms/xkms-common/pom.xml (original)
+++ cxf/trunk/services/xkms/xkms-common/pom.xml Tue May 21 13:13:08 2013
@@ -1,31 +1,37 @@
-<?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-common</artifactId>
-	<packaging>bundle</packaging>
-	<name>Apache CXF XKMS Common</name>
-	<url>http://cxf.apache.org</url>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.apache.cxf.services.xkms</groupId>
+    <artifactId>cxf-services-xkms-common</artifactId>
+    <packaging>bundle</packaging>
+    <name>Apache CXF XKMS Common</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>
@@ -34,41 +40,41 @@
         </dependency>
     </dependencies>
 
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.cxf</groupId>
-				<artifactId>cxf-codegen-plugin</artifactId>
-				<version>${project.version}</version>
-				<executions>
-					<execution>
-						<id>generate-sources</id>
-						<phase>generate-sources</phase>
-						<goals>
-							<goal>wsdl2java</goal>
-						</goals>
-						<configuration>
- 							<frontend>jaxws21</frontend>							
-							<wsdlOptions>
-								<wsdlOption>
-									<wsdl>${basedir}/src/main/model/xkms.wsdl</wsdl>
-									<bindingFile>${basedir}/src/main/model/binding.xjb</bindingFile>
-								</wsdlOption>
-							</wsdlOptions>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<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>
-		</plugins>
-	</build>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.cxf</groupId>
+                <artifactId>cxf-codegen-plugin</artifactId>
+                <version>${project.version}</version>
+                <executions>
+                    <execution>
+                        <id>generate-sources</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>wsdl2java</goal>
+                        </goals>
+                        <configuration>
+                            <frontend>jaxws21</frontend>
+                            <wsdlOptions>
+                                <wsdlOption>
+                                    <wsdl>${basedir}/src/main/model/xkms.wsdl</wsdl>
+                                    <bindingFile>${basedir}/src/main/model/binding.xjb</bindingFile>
+                                </wsdlOption>
+                            </wsdlOptions>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <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>
+        </plugins>
+    </build>
 </project>

Modified: cxf/trunk/services/xkms/xkms-features/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/services/xkms/xkms-features/pom.xml?rev=1484794&r1=1484793&r2=1484794&view=diff
==============================================================================
--- cxf/trunk/services/xkms/xkms-features/pom.xml (original)
+++ cxf/trunk/services/xkms/xkms-features/pom.xml Tue May 21 13:13:08 2013
@@ -1,78 +1,91 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (c) 2011 Talend Inc. - www.talend.com All rights reserved. 
-	This program and the accompanying materials are made available under the 
-	terms of the Apache License v2.0 which accompanies this distribution, and 
-	is available at http://www.apache.org/licenses/LICENSE-2.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.
+-->
 <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>
+    <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.cxf.services.xkms</groupId>
-	<artifactId>cxf-services-xkms-features</artifactId>
-	<packaging>pom</packaging>
-	<name>Apache CXF XKMS Karaf Features</name>
-	<url>http://cxf.apache.org</url>
+    <artifactId>cxf-services-xkms-features</artifactId>
+    <packaging>pom</packaging>
+    <name>Apache CXF XKMS Karaf Features</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>
 
-	<build>
-		<resources>
-			<resource>
-				<directory>${project.basedir}/src/main/resources</directory>
-				<filtering>true</filtering>
-				<includes>
-					<include>**/features.xml</include>
-					<include>**/*.cfg</include>
-					<include>**/*.properties</include>
-				</includes>
-			</resource>
-		</resources>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-resources-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>filter</id>
-						<phase>generate-resources</phase>
-						<goals>
-							<goal>resources</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>build-helper-maven-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>attach-artifacts</id>
-						<phase>package</phase>
-						<goals>
-							<goal>attach-artifact</goal>
-						</goals>
-						<configuration>
-							<artifacts>
-								<artifact>
-									<file>target/classes/features.xml</file>
-									<type>xml</type>
-								</artifact>
-								<artifact>
-									<file>target/classes/org.apache.cxf.xkms.cfg</file>
-									<classifier>org.apache.cxf.xkms</classifier>
-									<type>cfg</type>
-								</artifact>
-							</artifacts>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
+    <build>
+        <resources>
+            <resource>
+                <directory>${project.basedir}/src/main/resources</directory>
+                <filtering>true</filtering>
+                <includes>
+                    <include>**/features.xml</include>
+                    <include>**/*.cfg</include>
+                    <include>**/*.properties</include>
+                </includes>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>filter</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>resources</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>attach-artifacts</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>attach-artifact</goal>
+                        </goals>
+                        <configuration>
+                            <artifacts>
+                                <artifact>
+                                    <file>target/classes/features.xml</file>
+                                    <type>xml</type>
+                                </artifact>
+                                <artifact>
+                                    <file>target/classes/org.apache.cxf.xkms.cfg</file>
+                                    <classifier>org.apache.cxf.xkms</classifier>
+                                    <type>cfg</type>
+                                </artifact>
+                            </artifacts>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>

Modified: cxf/trunk/services/xkms/xkms-features/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/services/xkms/xkms-features/src/main/resources/features.xml?rev=1484794&r1=1484793&r2=1484794&view=diff
==============================================================================
--- cxf/trunk/services/xkms/xkms-features/src/main/resources/features.xml (original)
+++ cxf/trunk/services/xkms/xkms-features/src/main/resources/features.xml Tue May 21 13:13:08 2013
@@ -1,42 +1,41 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  #%L
-  Talend ESB Runtime :: Example Basic Features
-  %%
-  Copyright (C) 2011 Talend Inc.
-  %%
-  Licensed 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.
-  #L%
-  -->
+  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.
+-->
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.0.0">
 
-	<feature name="cxf-xkms-client" version="${project.version}">
-		<feature>cxf</feature>
-		<feature>spring-dm</feature>
-		<bundle>mvn:${project.groupId}/cxf-services-xkms-common/${project.version}</bundle>
-		<bundle>mvn:${project.groupId}/cxf-services-xkms-client/${project.version}</bundle>
-	</feature>
+    <feature name="cxf-xkms-client" version="${project.version}">
+        <feature>cxf</feature>
+        <feature>spring-dm</feature>
+        <bundle>mvn:${project.groupId}/cxf-services-xkms-common/${project.version}</bundle>
+        <bundle>mvn:${project.groupId}/cxf-services-xkms-client/${project.version}</bundle>
+    </feature>
 
-	<feature name="cxf-xkms-service" version="${project.version}">
-		<feature>cxf</feature>
-		<feature>spring-dm</feature>
-		<bundle>mvn:${project.groupId}/cxf-services-xkms-common/${project.version}</bundle>
-		<bundle>mvn:${project.groupId}/cxf-services-xkms-service/${project.version}</bundle>
-		<bundle>mvn:${project.groupId}/cxf-services-xkms-x509-handlers/${project.version}</bundle>
-		<bundle>mvn:${project.groupId}/cxf-services-xkms-osgi/${project.version}</bundle>
-		<configfile finalname="/etc/org.apache.cxf.xkms.cfg">
-			mvn:${project.groupId}/cxf-services-xkms-features/${project.version}/cfg/org.apache.cxf.xkms
-		</configfile>
-	</feature>
+    <feature name="cxf-xkms-service" version="${project.version}">
+        <feature>cxf</feature>
+        <feature>spring-dm</feature>
+        <bundle>mvn:${project.groupId}/cxf-services-xkms-common/${project.version}</bundle>
+        <bundle>mvn:${project.groupId}/cxf-services-xkms-service/${project.version}</bundle>
+        <bundle>mvn:${project.groupId}/cxf-services-xkms-x509-handlers/${project.version}</bundle>
+        <bundle>mvn:${project.groupId}/cxf-services-xkms-osgi/${project.version}</bundle>
+        <configfile finalname="/etc/org.apache.cxf.xkms.cfg">
+            mvn:${project.groupId}/cxf-services-xkms-features/${project.version}/cfg/org.apache.cxf.xkms
+        </configfile>
+    </feature>
 
 </features>

Modified: cxf/trunk/services/xkms/xkms-itests/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/services/xkms/xkms-itests/pom.xml?rev=1484794&r1=1484793&r2=1484794&view=diff
==============================================================================
--- cxf/trunk/services/xkms/xkms-itests/pom.xml (original)
+++ cxf/trunk/services/xkms/xkms-itests/pom.xml Tue May 21 13:13:08 2013
@@ -1,41 +1,47 @@
-<?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-itests</artifactId>
-	<name>Apache CXF XKMS Integration Tests</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>
-	
-	<properties>
-		<exam.version>2.6.0</exam.version>
-	</properties>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.apache.cxf.services.xkms</groupId>
-			<artifactId>cxf-services-xkms-common</artifactId>
-			<version>${project.version}</version>
-		</dependency>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.apache.cxf.services.xkms</groupId>
+    <artifactId>cxf-services-xkms-itests</artifactId>
+    <name>Apache CXF XKMS Integration Tests</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>
+
+    <properties>
+        <exam.version>2.6.0</exam.version>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.cxf.services.xkms</groupId>
+            <artifactId>cxf-services-xkms-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.cxf.services.xkms</groupId>
             <artifactId>cxf-services-xkms-x509-handlers</artifactId>
@@ -123,12 +129,12 @@
             <artifactId>slf4j-log4j12</artifactId>
             <version>1.6.1</version>
         </dependency>
-        
+
         <dependency>
-        	<groupId>org.apache.cxf.services.xkms</groupId>
-        	<artifactId>cxf-services-xkms-features</artifactId>
-        	<version>${project.version}</version>
-        	<type>xml</type>
+            <groupId>org.apache.cxf.services.xkms</groupId>
+            <artifactId>cxf-services-xkms-features</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
         </dependency>
     </dependencies>
 
@@ -156,42 +162,43 @@
             </plugin>
         </plugins>
         <pluginManagement>
-        	<plugins>
-        		<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
-        		<plugin>
-        			<groupId>org.eclipse.m2e</groupId>
-        			<artifactId>lifecycle-mapping</artifactId>
-        			<version>1.0.0</version>
-        			<configuration>
-        				<lifecycleMappingMetadata>
-        					<pluginExecutions>
-        						<pluginExecution>
-        							<pluginExecutionFilter>
-        								<groupId>
-        									org.ops4j.pax.exam
-        								</groupId>
-        								<artifactId>
-        									maven-paxexam-plugin
-        								</artifactId>
-        								<versionRange>
-        									[1.2.4,)
-        								</versionRange>
-        								<goals>
-        									<goal>
-        										generate-depends-file
-        									</goal>
-        									<goal>generate-config</goal>
-        								</goals>
-        							</pluginExecutionFilter>
-        							<action>
-        								<ignore></ignore>
-        							</action>
-        						</pluginExecution>
-        					</pluginExecutions>
-        				</lifecycleMappingMetadata>
-        			</configuration>
-        		</plugin>
-        	</plugins>
+            <plugins>
+                <!--This plugin's configuration is used to store Eclipse 
+                    m2e settings only. It has no influence on the Maven build itself. -->
+                <plugin>
+                    <groupId>org.eclipse.m2e</groupId>
+                    <artifactId>lifecycle-mapping</artifactId>
+                    <version>1.0.0</version>
+                    <configuration>
+                        <lifecycleMappingMetadata>
+                            <pluginExecutions>
+                                <pluginExecution>
+                                    <pluginExecutionFilter>
+                                        <groupId>
+                                            org.ops4j.pax.exam
+                                        </groupId>
+                                        <artifactId>
+                                            maven-paxexam-plugin
+                                        </artifactId>
+                                        <versionRange>
+                                            [1.2.4,)
+                                        </versionRange>
+                                        <goals>
+                                            <goal>
+                                                generate-depends-file
+                                            </goal>
+                                            <goal>generate-config</goal>
+                                        </goals>
+                                    </pluginExecutionFilter>
+                                    <action>
+                                        <ignore></ignore>
+                                    </action>
+                                </pluginExecution>
+                            </pluginExecutions>
+                        </lifecycleMappingMetadata>
+                    </configuration>
+                </plugin>
+            </plugins>
         </pluginManagement>
     </build>
 </project>

Modified: cxf/trunk/services/xkms/xkms-osgi/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/services/xkms/xkms-osgi/pom.xml?rev=1484794&r1=1484793&r2=1484794&view=diff
==============================================================================
--- cxf/trunk/services/xkms/xkms-osgi/pom.xml (original)
+++ cxf/trunk/services/xkms/xkms-osgi/pom.xml Tue May 21 13:13:08 2013
@@ -1,38 +1,44 @@
-<?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-osgi</artifactId>
-	<packaging>bundle</packaging>
-	<name>Apache CXF XKMS OSGi deployment</name>
-	<url>http://cxf.apache.org</url>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.apache.cxf.services.xkms</groupId>
+    <artifactId>cxf-services-xkms-osgi</artifactId>
+    <packaging>bundle</packaging>
+    <name>Apache CXF XKMS OSGi deployment</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.services.xkms</groupId>
-		<artifactId>cxf-services-xkms-common</artifactId>
-		<version>${project.version}</version>
-	</dependency>
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.cxf.services.xkms</groupId>
+            <artifactId>cxf-services-xkms-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.cxf.services.xkms</groupId>
             <artifactId>cxf-services-xkms-x509-handlers</artifactId>
@@ -43,24 +49,24 @@
             <artifactId>cxf-services-xkms-service</artifactId>
             <version>${project.version}</version>
         </dependency>
-	</dependencies>
+    </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>
-						<Require-Bundle>
-							org.apache.cxf.bundle,
-							org.springframework.beans
-						</Require-Bundle>
-					</instructions>
-				</configuration>
-			</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>
+                        <Require-Bundle>
+                            org.apache.cxf.bundle,
+                            org.springframework.beans
+                        </Require-Bundle>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>

Modified: cxf/trunk/services/xkms/xkms-osgi/src/main/resources/OSGI-INF/blueprint/cxf-endpoint.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/services/xkms/xkms-osgi/src/main/resources/OSGI-INF/blueprint/cxf-endpoint.xml?rev=1484794&r1=1484793&r2=1484794&view=diff
==============================================================================
--- cxf/trunk/services/xkms/xkms-osgi/src/main/resources/OSGI-INF/blueprint/cxf-endpoint.xml (original)
+++ cxf/trunk/services/xkms/xkms-osgi/src/main/resources/OSGI-INF/blueprint/cxf-endpoint.xml Tue May 21 13:13:08 2013
@@ -1,54 +1,58 @@
-<!-- #%L ReservationService Client %% Copyright (C) 2011 - 2012 Talend Inc. 
-	%% Licensed 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. 
-	#L% -->
+<!-- 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. -->
 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:cxf="http://cxf.apache.org/blueprint/core"
-	xmlns:jaxws="http://cxf.apache.org/blueprint/jaxws"
-	xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.0.0"
-	xmlns:ext="http://www.osgi.org/xmlns/blueprint-ext/v1.1.0"
-	xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0 http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd
-  						http://www.osgi.org/xmlns/blueprint-ext/v1.1.0 https://svn.apache.org/repos/asf/aries/tags/blueprint-0.3.1/blueprint-core/src/main/resources/org/apache/aries/blueprint/ext/blueprint-ext.xsd  
-  						http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.0.0 http://aries.apache.org/schemas/blueprint-cm/blueprint-cm-1.0.0.xsd
-  						http://cxf.apache.org/blueprint/jaxws http://cxf.apache.org/schemas/blueprint/jaxws.xsd
-  						http://cxf.apache.org/blueprint/core http://cxf.apache.org/schemas/blueprint/core.xsd
-  	">
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:cxf="http://cxf.apache.org/blueprint/core"
+    xmlns:jaxws="http://cxf.apache.org/blueprint/jaxws"
+    xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.0.0"
+    xmlns:ext="http://www.osgi.org/xmlns/blueprint-ext/v1.1.0"
+    xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0 http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd
+                        http://www.osgi.org/xmlns/blueprint-ext/v1.1.0 https://svn.apache.org/repos/asf/aries/tags/blueprint-0.3.1/blueprint-core/src/main/resources/org/apache/aries/blueprint/ext/blueprint-ext.xsd  
+                        http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.0.0 http://aries.apache.org/schemas/blueprint-cm/blueprint-cm-1.0.0.xsd
+                        http://cxf.apache.org/blueprint/jaxws http://cxf.apache.org/schemas/blueprint/jaxws.xsd
+                        http://cxf.apache.org/blueprint/core http://cxf.apache.org/schemas/blueprint/core.xsd
+">
 
-   <bean id="xkmsProviderBean" class="org.apache.cxf.xkms.service.XKMSService">
-      <property name="validators">
-         <list>
-            <ref component-id="dateValidator" />
-         </list>
-      </property>
-      <property name="locators">
-         <list>
-            <ref component-id="x509LdapLocator" />
-            <!-- ref component-id="x509FileLocator" /-->
-         </list>
-      </property>
-      <property name="keyRegisterHandlers">
-         <list>
-            <ref component-id="ldapRegisterHandler" />
-            <!-- ref component-id="fileRegisterHandler" /-->
-         </list>
-      </property>
-   </bean>
+    <bean id="xkmsProviderBean" class="org.apache.cxf.xkms.service.XKMSService">
+        <property name="validators">
+            <list>
+                <ref component-id="dateValidator" />
+            </list>
+        </property>
+        <property name="locators">
+            <list>
+                <ref component-id="x509LdapLocator" />
+                <!-- ref component-id="x509FileLocator" / -->
+            </list>
+        </property>
+        <property name="keyRegisterHandlers">
+            <list>
+                <ref component-id="ldapRegisterHandler" />
+                <!-- ref component-id="fileRegisterHandler" / -->
+            </list>
+        </property>
+    </bean>
 
-   <bean id="additionalClasses" class="org.apache.cxf.xkms.model.extensions.AdditionalClassesFactory"/>
+    <bean id="additionalClasses"
+        class="org.apache.cxf.xkms.model.extensions.AdditionalClassesFactory" />
 
-   <jaxws:endpoint id="XKMSService" xmlns:serviceNamespace="http://www.w3.org/2002/03/xkms#wsdl"
-      serviceName="serviceNamespace:XKMSService" endpointName="serviceNamespace:XKMSPort"
-      implementor="#xkmsProviderBean" address="/XKMS">
+    <jaxws:endpoint id="XKMSService"
+        xmlns:serviceNamespace="http://www.w3.org/2002/03/xkms#wsdl"
+        serviceName="serviceNamespace:XKMSService" endpointName="serviceNamespace:XKMSPort"
+        implementor="#xkmsProviderBean" address="/XKMS">
         <jaxws:properties>
             <entry key="jaxb.additionalContextClasses">
-            	<bean class="java.lang.Object" factory-ref="additionalClasses" factory-method="create"/>
+                <bean class="java.lang.Object" factory-ref="additionalClasses"
+                    factory-method="create" />
             </entry>
         </jaxws:properties>
-   </jaxws:endpoint>
+    </jaxws:endpoint>
 
 </blueprint>

Modified: cxf/trunk/services/xkms/xkms-osgi/src/main/resources/OSGI-INF/blueprint/xkms-key-handlers.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/services/xkms/xkms-osgi/src/main/resources/OSGI-INF/blueprint/xkms-key-handlers.xml?rev=1484794&r1=1484793&r2=1484794&view=diff
==============================================================================
--- cxf/trunk/services/xkms/xkms-osgi/src/main/resources/OSGI-INF/blueprint/xkms-key-handlers.xml (original)
+++ cxf/trunk/services/xkms/xkms-osgi/src/main/resources/OSGI-INF/blueprint/xkms-key-handlers.xml Tue May 21 13:13:08 2013
@@ -1,62 +1,75 @@
 <?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 -->
+<!--
+  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.
+-->
 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:cxf="http://cxf.apache.org/blueprint/core"
-	xmlns:jaxws="http://cxf.apache.org/blueprint/jaxws"
-	xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.0.0"
-	xmlns:ext="http://www.osgi.org/xmlns/blueprint-ext/v1.1.0"
-	xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0 http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd
-  						http://www.osgi.org/xmlns/blueprint-ext/v1.1.0 https://svn.apache.org/repos/asf/aries/tags/blueprint-0.3.1/blueprint-core/src/main/resources/org/apache/aries/blueprint/ext/blueprint-ext.xsd  
-  						http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.0.0 http://aries.apache.org/schemas/blueprint-cm/blueprint-cm-1.0.0.xsd
-  						http://cxf.apache.org/blueprint/jaxws http://cxf.apache.org/schemas/blueprint/jaxws.xsd
-  						http://cxf.apache.org/blueprint/core http://cxf.apache.org/schemas/blueprint/core.xsd
-  	">
-
-   <cm:property-placeholder persistent-id="org.apache.cxf.xkms"/>
-
-   <bean id="ldapSchemaConfig" class="org.apache.cxf.xkms.x509.handlers.LdapSchemaConfig">
-      <property name="certObjectClass" value="${xkms.ldap.schema.certObjectClass}" />
-      <property name="attrUID" value="${xkms.ldap.schema.attrUID}" />
-      <property name="attrIssuerID" value="${xkms.ldap.schema.attrIssuerID}" />
-      <property name="attrSerialNumber" value="${xkms.ldap.schema.attrSerialNumber}" />
-      <property name="attrCrtBinary" value="${xkms.ldap.schema.attrCrtBinary}" />
-      <property name="constAttrNamesCSV" value="${xkms.ldap.schema.constAttrNamesCSV}" />
-      <property name="constAttrValuesCSV" value="${xkms.ldap.schema.constAttrValuesCSV}" />
-      <property name="serviceCertRDNTemplate" value="${xkms.ldap.schema.serviceCertRDNTemplate}" />
-      <property name="serviceCertUIDTemplate" value="${xkms.ldap.schema.serviceCertUIDTemplate}" />
-   </bean>
-
-   <bean id="dateValidator" class="org.apache.cxf.xkms.x509.validator.DateValidator" />
-
-   <bean id="x509LdapLocator" class="org.apache.cxf.xkms.x509.locator.LdapLocator">
-      <argument ref="ldapSearch" />
-      <argument ref="ldapSchemaConfig" />
-      <argument value="${xkms.ldap.rootDN}" />
-   </bean>
-
-    <bean id="ldapRegisterHandler" class="org.apache.cxf.xkms.x509.handlers.LdapRegisterHandler">
-      <argument ref="ldapSearch" />
-      <argument ref="ldapSchemaConfig" />
-      <argument value="${xkms.ldap.rootDN}" />
-   </bean>
-
-   <bean id="ldapSearch" class="org.apache.cxf.xkms.x509.handlers.LdapSearch">
-      <argument value="${xkms.ldap.url}" />
-      <argument value="${xkms.ldap.user}" />
-      <argument value="${xkms.ldap.pwd}" />
-      <argument value="${xkms.ldap.retry}" />
-   </bean>
-
-   <!-- bean id="x509FileLocator" class="org.apache.cxf.xkms.x509.locator.FileLocator">
-      <argument value="${xkms.backend.file.storageDir}" />
-   </bean>
-
-   <bean id="fileRegisterHandler" class="org.apache.cxf.xkms.x509.handlers.FileRegisterHandler">
-      <argument value="${xkms.filepersistence.storageDir}" />
-   </bean-->
-   
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:cxf="http://cxf.apache.org/blueprint/core"
+    xmlns:jaxws="http://cxf.apache.org/blueprint/jaxws"
+    xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.0.0"
+    xmlns:ext="http://www.osgi.org/xmlns/blueprint-ext/v1.1.0"
+    xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0 http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd
+                        http://www.osgi.org/xmlns/blueprint-ext/v1.1.0 https://svn.apache.org/repos/asf/aries/tags/blueprint-0.3.1/blueprint-core/src/main/resources/org/apache/aries/blueprint/ext/blueprint-ext.xsd  
+                        http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.0.0 http://aries.apache.org/schemas/blueprint-cm/blueprint-cm-1.0.0.xsd
+                        http://cxf.apache.org/blueprint/jaxws http://cxf.apache.org/schemas/blueprint/jaxws.xsd
+                        http://cxf.apache.org/blueprint/core http://cxf.apache.org/schemas/blueprint/core.xsd
+">
+
+    <cm:property-placeholder persistent-id="org.apache.cxf.xkms" />
+
+    <bean id="ldapSchemaConfig" class="org.apache.cxf.xkms.x509.handlers.LdapSchemaConfig">
+        <property name="certObjectClass" value="${xkms.ldap.schema.certObjectClass}" />
+        <property name="attrUID" value="${xkms.ldap.schema.attrUID}" />
+        <property name="attrIssuerID" value="${xkms.ldap.schema.attrIssuerID}" />
+        <property name="attrSerialNumber" value="${xkms.ldap.schema.attrSerialNumber}" />
+        <property name="attrCrtBinary" value="${xkms.ldap.schema.attrCrtBinary}" />
+        <property name="constAttrNamesCSV" value="${xkms.ldap.schema.constAttrNamesCSV}" />
+        <property name="constAttrValuesCSV" value="${xkms.ldap.schema.constAttrValuesCSV}" />
+        <property name="serviceCertRDNTemplate"
+            value="${xkms.ldap.schema.serviceCertRDNTemplate}" />
+        <property name="serviceCertUIDTemplate"
+            value="${xkms.ldap.schema.serviceCertUIDTemplate}" />
+    </bean>
+
+    <bean id="dateValidator" class="org.apache.cxf.xkms.x509.validator.DateValidator" />
+
+    <bean id="x509LdapLocator" class="org.apache.cxf.xkms.x509.locator.LdapLocator">
+        <argument ref="ldapSearch" />
+        <argument ref="ldapSchemaConfig" />
+        <argument value="${xkms.ldap.rootDN}" />
+    </bean>
+
+    <bean id="ldapRegisterHandler"
+        class="org.apache.cxf.xkms.x509.handlers.LdapRegisterHandler">
+        <argument ref="ldapSearch" />
+        <argument ref="ldapSchemaConfig" />
+        <argument value="${xkms.ldap.rootDN}" />
+    </bean>
+
+    <bean id="ldapSearch" class="org.apache.cxf.xkms.x509.handlers.LdapSearch">
+        <argument value="${xkms.ldap.url}" />
+        <argument value="${xkms.ldap.user}" />
+        <argument value="${xkms.ldap.pwd}" />
+        <argument value="${xkms.ldap.retry}" />
+    </bean>
+
+    <!-- bean id="x509FileLocator" class="org.apache.cxf.xkms.x509.locator.FileLocator"> 
+        <argument value="${xkms.backend.file.storageDir}" /> </bean> <bean id="fileRegisterHandler" 
+        class="org.apache.cxf.xkms.x509.handlers.FileRegisterHandler"> <argument 
+        value="${xkms.filepersistence.storageDir}" /> </bean -->
+
 </blueprint>

Modified: cxf/trunk/services/xkms/xkms-osgi/src/test/resources/test-requests/request-locate.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/services/xkms/xkms-osgi/src/test/resources/test-requests/request-locate.xml?rev=1484794&r1=1484793&r2=1484794&view=diff
==============================================================================
--- cxf/trunk/services/xkms/xkms-osgi/src/test/resources/test-requests/request-locate.xml (original)
+++ cxf/trunk/services/xkms/xkms-osgi/src/test/resources/test-requests/request-locate.xml Tue May 21 13:13:08 2013
@@ -1,12 +1,12 @@
 <soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
-	<soap:Body>
-		<ns2:LocateRequest xmlns="http://www.w3.org/2000/09/xmldsig#"
-			xmlns:ns2="http://www.w3.org/2002/03/xkms#" xmlns:ns3="http://www.w3.org/2001/04/xmlenc#">
-			<ns2:QueryKeyBinding>
-				<ns2:UseKeyWith Application="urn:ietf:rfc:2459"
-					Identifier="CN=www.issuer.com" />
-			</ns2:QueryKeyBinding>
-		</ns2:LocateRequest>
-	</soap:Body>
+    <soap:Body>
+        <ns2:LocateRequest xmlns="http://www.w3.org/2000/09/xmldsig#"
+            xmlns:ns2="http://www.w3.org/2002/03/xkms#" xmlns:ns3="http://www.w3.org/2001/04/xmlenc#">
+            <ns2:QueryKeyBinding>
+                <ns2:UseKeyWith Application="urn:ietf:rfc:2459"
+                    Identifier="CN=www.issuer.com" />
+            </ns2:QueryKeyBinding>
+        </ns2:LocateRequest>
+    </soap:Body>
 </soap:Envelope>
 

Modified: cxf/trunk/services/xkms/xkms-osgi/src/test/resources/test-requests/request-validate.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/services/xkms/xkms-osgi/src/test/resources/test-requests/request-validate.xml?rev=1484794&r1=1484793&r2=1484794&view=diff
==============================================================================
--- cxf/trunk/services/xkms/xkms-osgi/src/test/resources/test-requests/request-validate.xml (original)
+++ cxf/trunk/services/xkms/xkms-osgi/src/test/resources/test-requests/request-validate.xml Tue May 21 13:13:08 2013
@@ -1,15 +1,16 @@
 <soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
-	<soap:Body>
-		<ns2:ValidateRequest xmlns="http://www.w3.org/2000/09/xmldsig#"
-			xmlns:ns2="http://www.w3.org/2002/03/xkms#" xmlns:ns3="http://www.w3.org/2001/04/xmlenc#"
-			Id="CN=www.anothersts.com, L=CGN, ST=NRW, C=DE, O=AnotherSTS">
-			<ns2:QueryKeyBinding>
-				<KeyInfo>
-					<X509Data>
-						<X509Certificate>MIIFIjCCAwoCAQEwDQYJKoZIhvcNAQEFBQAwUzEPMA0GA1UEChMGSXNzdWVyMQswCQYDVQQGEwJERTEMMAoGA1UECBMDTlJXMQwwCgYDVQQHEwNDR04xFzAVBgNVBAMTDnd3dy5pc3N1ZXIuY29tMB4XDTEyMDIyOTEyMjMxOVoXDTEzMDIyODEyMjMxOVowWzETMBEGA1UEChMKQW5vdGhlclNUUzELMAkGA1UEBhMCREUxDDAKBgNVBAgTA05SVzEMMAoGA1UEBxMDQ0dOMRswGQYDVQQDExJ3d3cuYW5vdGhlcnN0cy5jb20wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC89tdiW7NQcof51k/9T0X12bAuXlxS+KhRhwnruus1D5zLhw391fGUEU/3gGdQ5HXuwE2sIGVWfoaR71nd0uWl7ACfwuv4Isgblvvaa6XKzhGsG2bLDM/M0Swghr/YgO/627iuESOJ2Ub2ejYDVWk6HOTZOHdA9IUcXwJxntG1eiFCxcAsJOVs5fu4BFVq2gu2idi4QCuhxpAOEqY/hT5HsMT7sTPhsLZxC9MDY3Z04bikulOwRSpi+21w4xqlkVxAjxMFuB7kANQONNfapgOf2rY/sDETH8catfBvPiDXfRFouIPmqVssvRTbHlIXm3z0dM9fw6N/mkfNdt/BmONtfHr12qgErWg3kUpnDxshOPI7qqISQHR76zxLSTZaLeSplPVE5aPuvCTGQMNpujJIMKTQCUo9sgabu0JpwkaT0zMAJJXIDPV1kwEMf7jU/IhsppCBW1il02LC5I9hytYZyXHylpyEOqR0VOLw+7a0F5NGz95X6K6YMKUlmCnPjhdJDz4CFSqeyH0/7O69vooEYIHEOWEQRKtqb1qYWcx/P/gYU49IcQMB7Z87+i0StsA1D66FK5l3ejEWYOR0UIonzXTtCukmRg
 CXeUBbO5skE70HMoJmQfKTfhNLdx480SbfkwJ9cLc5lRFimjEbtcYn/bYQvbnR+hprGnd4+36jvwIDAQABMA0GCSqGSIb3DQEBBQUAA4ICAQBLKToriq3mex/ZHPTPh14RIONwzpXzmLvx9UjsxUI2k49OJHWrowLyEtyX4TLf9Gd9POAmjFBWxWK2nQLYisWQg07NSgOWDvtGj1Ql6XjGdY59JYh1N1h+Ppd/Sb/FsPDN+CQ7+8Xf2nfocbJafktOI6xZJe4PynENi/TIjjX6mdBN4pirNtLXCPzEVyP8MDphrmBrSGGTYU3loz9TzsLfiDLbh5x2Nyg33hSolGOpfHXFNFAo3T/fMA47vmr07qh7cKwJw6loxcU1AcC/Uhab6QgWySHyTyguH7EFGN9a0/7IRynd+UVqErA2DyjCE6mgzzT7mqVg5ox8W4Flzq2kmip8foLAZ4zW6b19y71+2LUVIPguEfufhLbpmmF65ezDZUmYRYFFHWulhPufSpfEUZguKXIM0voIXAgYrbdtLmHPTGb8Qm3qPDcVQJsOEeqTDbRB9nnXP1t+gaSKr/IO597Mr9o9+TUq2WlH1H3NauLL3XCsWmL0pBEBM8a5fMxs04xPdW9V6A8EyHk4CcSOofMJiAZQIlllqsdYQBsOD/iGVHeVYXSnP0PnQmCjdQMaoGIl/dC6oLuk2EerekIuR1NVMdGchpPY/Q2GQmpnnou0faCK/pE9nUEoh+uxva6iOi7Ns2O3gR2aXxeZM1Bgm4SwTnAl5Acnpy5Forg5pg==</X509Certificate>
-					</X509Data>
-				</KeyInfo>
-			</ns2:QueryKeyBinding>
-		</ns2:ValidateRequest>
-	</soap:Body>
+    <soap:Body>
+        <ns2:ValidateRequest xmlns="http://www.w3.org/2000/09/xmldsig#"
+            xmlns:ns2="http://www.w3.org/2002/03/xkms#" xmlns:ns3="http://www.w3.org/2001/04/xmlenc#"
+            Id="CN=www.anothersts.com, L=CGN, ST=NRW, C=DE, O=AnotherSTS">
+            <ns2:QueryKeyBinding>
+                <KeyInfo>
+                    <X509Data>
+                        <X509Certificate>MIIFIjCCAwoCAQEwDQYJKoZIhvcNAQEFBQAwUzEPMA0GA1UEChMGSXNzdWVyMQswCQYDVQQGEwJERTEMMAoGA1UECBMDTlJXMQwwCgYDVQQHEwNDR04xFzAVBgNVBAMTDnd3dy5pc3N1ZXIuY29tMB4XDTEyMDIyOTEyMjMxOVoXDTEzMDIyODEyMjMxOVowWzETMBEGA1UEChMKQW5vdGhlclNUUzELMAkGA1UEBhMCREUxDDAKBgNVBAgTA05SVzEMMAoGA1UEBxMDQ0dOMRswGQYDVQQDExJ3d3cuYW5vdGhlcnN0cy5jb20wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC89tdiW7NQcof51k/9T0X12bAuXlxS+KhRhwnruus1D5zLhw391fGUEU/3gGdQ5HXuwE2sIGVWfoaR71nd0uWl7ACfwuv4Isgblvvaa6XKzhGsG2bLDM/M0Swghr/YgO/627iuESOJ2Ub2ejYDVWk6HOTZOHdA9IUcXwJxntG1eiFCxcAsJOVs5fu4BFVq2gu2idi4QCuhxpAOEqY/hT5HsMT7sTPhsLZxC9MDY3Z04bikulOwRSpi+21w4xqlkVxAjxMFuB7kANQONNfapgOf2rY/sDETH8catfBvPiDXfRFouIPmqVssvRTbHlIXm3z0dM9fw6N/mkfNdt/BmONtfHr12qgErWg3kUpnDxshOPI7qqISQHR76zxLSTZaLeSplPVE5aPuvCTGQMNpujJIMKTQCUo9sgabu0JpwkaT0zMAJJXIDPV1kwEMf7jU/IhsppCBW1il02LC5I9hytYZyXHylpyEOqR0VOLw+7a0F5NGz95X6K6YMKUlmCnPjhdJDz4CFSqeyH0/7O69vooEYIHEOWEQRKtqb1qYWcx/P/gYU49IcQMB7Z87+i0StsA1D66FK5l3ejEW
 YOR0UIonzXTtCukmRgCXeUBbO5skE70HMoJmQfKTfhNLdx480SbfkwJ9cLc5lRFimjEbtcYn/bYQvbnR+hprGnd4+36jvwIDAQABMA0GCSqGSIb3DQEBBQUAA4ICAQBLKToriq3mex/ZHPTPh14RIONwzpXzmLvx9UjsxUI2k49OJHWrowLyEtyX4TLf9Gd9POAmjFBWxWK2nQLYisWQg07NSgOWDvtGj1Ql6XjGdY59JYh1N1h+Ppd/Sb/FsPDN+CQ7+8Xf2nfocbJafktOI6xZJe4PynENi/TIjjX6mdBN4pirNtLXCPzEVyP8MDphrmBrSGGTYU3loz9TzsLfiDLbh5x2Nyg33hSolGOpfHXFNFAo3T/fMA47vmr07qh7cKwJw6loxcU1AcC/Uhab6QgWySHyTyguH7EFGN9a0/7IRynd+UVqErA2DyjCE6mgzzT7mqVg5ox8W4Flzq2kmip8foLAZ4zW6b19y71+2LUVIPguEfufhLbpmmF65ezDZUmYRYFFHWulhPufSpfEUZguKXIM0voIXAgYrbdtLmHPTGb8Qm3qPDcVQJsOEeqTDbRB9nnXP1t+gaSKr/IO597Mr9o9+TUq2WlH1H3NauLL3XCsWmL0pBEBM8a5fMxs04xPdW9V6A8EyHk4CcSOofMJiAZQIlllqsdYQBsOD/iGVHeVYXSnP0PnQmCjdQMaoGIl/dC6oLuk2EerekIuR1NVMdGchpPY/Q2GQmpnnou0faCK/pE9nUEoh+uxva6iOi7Ns2O3gR2aXxeZM1Bgm4SwTnAl5Acnpy5Forg5pg==
+                        </X509Certificate>
+                    </X509Data>
+                </KeyInfo>
+            </ns2:QueryKeyBinding>
+        </ns2:ValidateRequest>
+    </soap:Body>
 </soap:Envelope>
\ No newline at end of file

Modified: cxf/trunk/services/xkms/xkms-osgi/src/test/resources/test-requests/response-locate.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/services/xkms/xkms-osgi/src/test/resources/test-requests/response-locate.xml?rev=1484794&r1=1484793&r2=1484794&view=diff
==============================================================================
--- cxf/trunk/services/xkms/xkms-osgi/src/test/resources/test-requests/response-locate.xml (original)
+++ cxf/trunk/services/xkms/xkms-osgi/src/test/resources/test-requests/response-locate.xml Tue May 21 13:13:08 2013
@@ -1,17 +1,17 @@
 <soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
-	<soap:Body>
-		<ns2:LocateResult xmlns="http://www.w3.org/2000/09/xmldsig#"
-			xmlns:ns2="http://www.w3.org/2002/03/xkms#" xmlns:ns3="http://www.w3.org/2001/04/xmlenc#"
-			ResultMajor="http://www.w3.org/2002/03/xkms#Success" Id="3bcbb1d6-3215-41aa-aafe-8192e324d283"
-			Service="http://services.sopera.org/xkms/v2.0">
-			<ns2:UnverifiedKeyBinding>
-				<KeyInfo>
-					<X509Data>
-						<X509Certificate>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
-						</X509Certificate>
-					</X509Data>
-				</KeyInfo>
-			</ns2:UnverifiedKeyBinding>
-		</ns2:LocateResult>
-	</soap:Body>
+    <soap:Body>
+        <ns2:LocateResult xmlns="http://www.w3.org/2000/09/xmldsig#"
+            xmlns:ns2="http://www.w3.org/2002/03/xkms#" xmlns:ns3="http://www.w3.org/2001/04/xmlenc#"
+            ResultMajor="http://www.w3.org/2002/03/xkms#Success" Id="3bcbb1d6-3215-41aa-aafe-8192e324d283"
+            Service="http://services.sopera.org/xkms/v2.0">
+            <ns2:UnverifiedKeyBinding>
+                <KeyInfo>
+                    <X509Data>
+                        <X509Certificate>MIIF4DCCA8igAwIBAgIJAKI2DZw3MLqRMA0GCSqGSIb3DQEBBQUAMFMxDzANBgNVBAoTBklzc3VlcjELMAkGA1UEBhMCREUxDDAKBgNVBAgTA05SVzEMMAoGA1UEBxMDQ0dOMRcwFQYDVQQDEw53d3cuaXNzdWVyLmNvbTAeFw0xMjAyMjkxMDIzMDFaFw0xMzAyMjgxMDIzMDFaMFMxDzANBgNVBAoTBklzc3VlcjELMAkGA1UEBhMCREUxDDAKBgNVBAgTA05SVzEMMAoGA1UEBxMDQ0dOMRcwFQYDVQQDEw53d3cuaXNzdWVyLmNvbTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMSCbQd/92wAJnfaFZTRmEP0afGGS0lGJghLg3uoMpewcQj4A2RZVJl2sfFbk/OppUqtJYxLKv0LRkx9MsZ2rQOq1YfmHShxpb6PeyRx8dEgSCtgWivVzKk/w+UudilQVC3cTNWtCayjajHcc0UAG4Kaaypl5CNEWH0M4JapcjFCwU3t7INI/DcAZK2J0aZI0pevw977nEzHyHOeea3O0RFrTTQomt/fv4gtP08F4x13cK0ssD93YZwhzFQ/63E/P0UM6daKJG8Ysg9owjwuSGR6bDR/FNuDeH4hqq0QGuvFHANpVTakvE5d+WWw1BDIZ8RK2vf3yFs+/jazTUhUJvoiniqtTf6VnMUmI7n5mDFQbutiIOeFzK4bQ+KKYch/aO2Pc6dXoEYmCfgA/SdcoOhEfGJKqU8mvPU/bXJEDVj1VgFzRssnaZcmReXfrcFuxW9fkVMEQ4jXlUF6v63uwqpdMWqgBGlti5hHjOuE/MOYpmBv6mUNX0MxqtgRU7/8fUoR6HwgAlRBOoWGCHIzv/0V6fSm804OiUf+DY65dbpZRhZmd7yANYYoewSwrNokDXGlz6e5
 cPaXMUnakIgcj2crr+dqQpxkrpTgP5ihq8Jrw8GHYZwm0SE4dqhA/DcyL6UlJarZSk7U3XEGvs60p0YThEgbpHCkgyruxocyQ4z3AgMBAAGjgbYwgbMwHQYDVR0OBBYEFCN8oLmMeAxU7v5mcE6U2bDmP63cMIGDBgNVHSMEfDB6gBQjfKC5jHgMVO7+ZnBOlNmw5j+t3KFXpFUwUzEPMA0GA1UEChMGSXNzdWVyMQswCQYDVQQGEwJERTEMMAoGA1UECBMDTlJXMQwwCgYDVQQHEwNDR04xFzAVBgNVBAMTDnd3dy5pc3N1ZXIuY29tggkAojYNnDcwupEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAgEAPDAcr3TdfLlczzkBR6iiN63ERK/FnIcB8vIJdxJeYsq/w49CgxMjOugGsZ7rKTmT89zPQzVe/GJITRHNS1q81cf8hd4SWZ/i3z7k8tqhMRq0b31aQqkLzjPWD6PAwzDWUAY8HMMq9Gbxx52u4yXxx1PabTxq/0EDtX7+JfZ462BGtWCcUrrXq6Wck4acvAw2NmMfUR+RYLVKLINen82KD1YAl+mOKFfc3r9i1mLi/ylE2LuKN6Z3LnYAcaUgq22mRKR6hGXyw4zU2HzFNlgBnoJottYdZWxa5Chcr6wMgZS/rg3gQ8z6ALOFG/UTBxcXRmI0CCBhTPjn4Dq8gd+BWixBzFVF8DoYEyVEX7fGNOAwb3OZCQMVsaM6PuqIfiz0s5oiqdohYSzwXc6ajmQB7JJkfHE8B43dnL+G1+d2mqvhXhTeJNlwC0Hcqtc7MY2rRDY0Kj0LrGqjhN6kKiXHXA0YqVpn1W7qsu+GS51jxpxZ2DUELNuIhXU/xbP3IS/BKMgiwNM2kZBtP0qkfKlsO9IemiQTNGZzxm+DJvE5U4wC0cVxsvqRTqdfKumaIMoUHsIrC5OWibTZ658KFuZZGHtxolH1sZnSP
 js9D9RC9xDv5OyIHcHcMhN6c7wk2Tf3GpY91r6Sp6TxIkB2cZQDT8eTSS/PTHC+muh5/365lRE=
+                        </X509Certificate>
+                    </X509Data>
+                </KeyInfo>
+            </ns2:UnverifiedKeyBinding>
+        </ns2:LocateResult>
+    </soap:Body>
 </soap:Envelope>
\ No newline at end of file

Modified: cxf/trunk/services/xkms/xkms-osgi/src/test/resources/test-requests/response-validate.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/services/xkms/xkms-osgi/src/test/resources/test-requests/response-validate.xml?rev=1484794&r1=1484793&r2=1484794&view=diff
==============================================================================
--- cxf/trunk/services/xkms/xkms-osgi/src/test/resources/test-requests/response-validate.xml (original)
+++ cxf/trunk/services/xkms/xkms-osgi/src/test/resources/test-requests/response-validate.xml Tue May 21 13:13:08 2013
@@ -1,17 +1,17 @@
 <soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
-	<soap:Body>
-		<ns2:ValidateResult xmlns="http://www.w3.org/2000/09/xmldsig#"
-			xmlns:ns2="http://www.w3.org/2002/03/xkms#" xmlns:ns3="http://www.w3.org/2001/04/xmlenc#"
-			ResultMajor="http://www.w3.org/2002/03/xkms#Success"
-			RequestId="CN=www.anothersts.com, L=CGN, ST=NRW, C=DE, O=AnotherSTS"
-			Id="bbc29ec6-11b5-4dd1-97d4-01279fb0e8a5" Service="http://services.sopera.org/xkms/v2.0">
-			<ns2:KeyBinding>
-				<ns2:Status StatusValue="http://www.w3.org/2002/03/xkms#Valid">
-					<ns2:ValidReason>http://www.w3.org/2002/03/xkms#IssuerTrust</ns2:ValidReason>
-					<ns2:ValidReason>http://www.w3.org/2002/03/xkms#Signature</ns2:ValidReason>
-					<ns2:ValidReason>http://www.w3.org/2002/03/xkms#ValidityInterval</ns2:ValidReason>
-				</ns2:Status>
-			</ns2:KeyBinding>
-		</ns2:ValidateResult>
-	</soap:Body>
+    <soap:Body>
+        <ns2:ValidateResult xmlns="http://www.w3.org/2000/09/xmldsig#"
+            xmlns:ns2="http://www.w3.org/2002/03/xkms#" xmlns:ns3="http://www.w3.org/2001/04/xmlenc#"
+            ResultMajor="http://www.w3.org/2002/03/xkms#Success"
+            RequestId="CN=www.anothersts.com, L=CGN, ST=NRW, C=DE, O=AnotherSTS"
+            Id="bbc29ec6-11b5-4dd1-97d4-01279fb0e8a5" Service="http://services.sopera.org/xkms/v2.0">
+            <ns2:KeyBinding>
+                <ns2:Status StatusValue="http://www.w3.org/2002/03/xkms#Valid">
+                    <ns2:ValidReason>http://www.w3.org/2002/03/xkms#IssuerTrust</ns2:ValidReason>
+                    <ns2:ValidReason>http://www.w3.org/2002/03/xkms#Signature</ns2:ValidReason>
+                    <ns2:ValidReason>http://www.w3.org/2002/03/xkms#ValidityInterval</ns2:ValidReason>
+                </ns2:Status>
+            </ns2:KeyBinding>
+        </ns2:ValidateResult>
+    </soap:Body>
 </soap:Envelope>
\ No newline at end of file

Modified: cxf/trunk/services/xkms/xkms-service/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/services/xkms/xkms-service/pom.xml?rev=1484794&r1=1484793&r2=1484794&view=diff
==============================================================================
--- cxf/trunk/services/xkms/xkms-service/pom.xml (original)
+++ cxf/trunk/services/xkms/xkms-service/pom.xml Tue May 21 13:13:08 2013
@@ -1,14 +1,21 @@
-<?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">
 

Modified: cxf/trunk/services/xkms/xkms-war/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/services/xkms/xkms-war/pom.xml?rev=1484794&r1=1484793&r2=1484794&view=diff
==============================================================================
--- cxf/trunk/services/xkms/xkms-war/pom.xml (original)
+++ cxf/trunk/services/xkms/xkms-war/pom.xml Tue May 21 13:13:08 2013
@@ -1,5 +1,5 @@
 <!--
-  Licensed to the Apache Soft Foundation (ASF) under one
+  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
@@ -10,13 +10,14 @@
   http://www.apache.org/licenses/LICENSE-2.0
  
   Unless required by applicable law or agreed to in writing,
-  softwwareare distributed under the License is distributed on an
+  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">
+<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">
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.cxf.services.xkms</groupId>
@@ -44,9 +45,9 @@
             <scope>runtime</scope>
         </dependency>
         <dependency>
-           <groupId>org.springframework</groupId>
-           <artifactId>spring-web</artifactId>
-        </dependency> 
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.apache.cxf.services.xkms</groupId>
             <artifactId>cxf-services-xkms-common</artifactId>

Modified: cxf/trunk/services/xkms/xkms-war/src/main/webapp/WEB-INF/cxf-servlet.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/services/xkms/xkms-war/src/main/webapp/WEB-INF/cxf-servlet.xml?rev=1484794&r1=1484793&r2=1484794&view=diff
==============================================================================
--- cxf/trunk/services/xkms/xkms-war/src/main/webapp/WEB-INF/cxf-servlet.xml (original)
+++ cxf/trunk/services/xkms/xkms-war/src/main/webapp/WEB-INF/cxf-servlet.xml Tue May 21 13:13:08 2013
@@ -16,12 +16,9 @@
   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"
+<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
@@ -32,13 +29,13 @@
         http://cxf.apache.org/schemas/jaxws.xsd
         http://www.springframework.org/schema/util
         http://www.springframework.org/schema/util/spring-util-2.0.xsd">
-    <import resource="classpath:META-INF/cxf/cxf.xml"/>
-    <import resource="xkms-endpoint.xml"/>  
-    <import resource="xkms-key-handlers.xml"/>   
+    <import resource="classpath:META-INF/cxf/cxf.xml" />
+    <import resource="xkms-endpoint.xml" />
+    <import resource="xkms-key-handlers.xml" />
 
     <cxf:bus>
         <cxf:features>
-            <cxf:logging/>
+            <cxf:logging />
         </cxf:features>
     </cxf:bus>
 

Modified: cxf/trunk/services/xkms/xkms-war/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/services/xkms/xkms-war/src/main/webapp/WEB-INF/web.xml?rev=1484794&r1=1484793&r2=1484794&view=diff
==============================================================================
--- cxf/trunk/services/xkms/xkms-war/src/main/webapp/WEB-INF/web.xml (original)
+++ cxf/trunk/services/xkms/xkms-war/src/main/webapp/WEB-INF/web.xml Tue May 21 13:13:08 2013
@@ -17,25 +17,25 @@
   under the License.
 -->
 <web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee 
-         http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
-	<display-name>CXF STS</display-name>
-	<servlet>
-		<servlet-name>xkms</servlet-name>
-		<servlet-class>org.apache.cxf.transport.servlet.CXFServlet</servlet-class>
-		<!-- <load-on-startup>1</load-on-startup> -->
-		<init-param>
-			<param-name>config-location</param-name>
-			<param-value>WEB-INF/cxf-servlet.xml</param-value>
-		</init-param>
-	</servlet>
-	<servlet-mapping>
-		<servlet-name>xkms</servlet-name>
-		<url-pattern>/*</url-pattern>
-	</servlet-mapping>
-	<session-config>
-		<session-timeout>60</session-timeout>
-	</session-config>
-        
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee 
+    http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+    <display-name>CXF STS</display-name>
+    <servlet>
+        <servlet-name>xkms</servlet-name>
+        <servlet-class>org.apache.cxf.transport.servlet.CXFServlet</servlet-class>
+        <!-- <load-on-startup>1</load-on-startup> -->
+        <init-param>
+            <param-name>config-location</param-name>
+            <param-value>WEB-INF/cxf-servlet.xml</param-value>
+        </init-param>
+    </servlet>
+    <servlet-mapping>
+        <servlet-name>xkms</servlet-name>
+        <url-pattern>/*</url-pattern>
+    </servlet-mapping>
+    <session-config>
+        <session-timeout>60</session-timeout>
+    </session-config>
+
 </web-app>

Modified: cxf/trunk/services/xkms/xkms-war/src/main/webapp/WEB-INF/xkms-endpoint.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/services/xkms/xkms-war/src/main/webapp/WEB-INF/xkms-endpoint.xml?rev=1484794&r1=1484793&r2=1484794&view=diff
==============================================================================
--- cxf/trunk/services/xkms/xkms-war/src/main/webapp/WEB-INF/xkms-endpoint.xml (original)
+++ cxf/trunk/services/xkms/xkms-war/src/main/webapp/WEB-INF/xkms-endpoint.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
@@ -23,44 +33,46 @@
 
     <cxf:bus>
         <cxf:features>
-            <cxf:logging/>
+            <cxf:logging />
         </cxf:features>
     </cxf:bus>
 
-   <bean id="xkmsProviderBean" class="org.apache.cxf.xkms.service.XKMSService">
-      <property name="validators">
-         <list>
-            <ref bean="dateValidator" />
-         </list>
-      </property>
-      <property name="locators">
-         <list>
-            <!--ref bean="x509LdapLocator" /-->
-            <ref bean="x509FileLocator" />
-         </list>
-      </property>
-      <property name="keyRegisterHandlers">
-         <list>
-            <!--ref bean="ldapRegisterHandler" /-->
-            <ref bean="fileRegisterHandler" />
-         </list>
-      </property>
-   </bean>
+    <bean id="xkmsProviderBean" class="org.apache.cxf.xkms.service.XKMSService">
+        <property name="validators">
+            <list>
+                <ref bean="dateValidator" />
+            </list>
+        </property>
+        <property name="locators">
+            <list>
+                <!--ref bean="x509LdapLocator" /-->
+                <ref bean="x509FileLocator" />
+            </list>
+        </property>
+        <property name="keyRegisterHandlers">
+            <list>
+                <!--ref bean="ldapRegisterHandler" /-->
+                <ref bean="fileRegisterHandler" />
+            </list>
+        </property>
+    </bean>
 
-   <jaxws:endpoint id="XKMSService" xmlns:serviceNamespace="http://www.w3.org/2002/03/xkms#wsdl"
-      serviceName="serviceNamespace:XKMSService" endpointName="serviceNamespace:XKMSPort"
-      implementor="#xkmsProviderBean" address="/XKMS">
-       <jaxws:properties>
-          <entry key="jaxb.additionalContextClasses">
-             <bean class="org.apache.cxf.xkms.model.extensions.ClassArrayFactoryBean">
-               <property name="classNames">
-                  <list>
-                     <value>org.apache.cxf.xkms.model.extensions.ResultDetails</value>
-                  </list>
-               </property>
-             </bean>
-          </entry>
-       </jaxws:properties>
-     </jaxws:endpoint>
+    <jaxws:endpoint id="XKMSService"
+        xmlns:serviceNamespace="http://www.w3.org/2002/03/xkms#wsdl"
+        serviceName="serviceNamespace:XKMSService" endpointName="serviceNamespace:XKMSPort"
+        implementor="#xkmsProviderBean" address="/XKMS">
+        <jaxws:properties>
+            <entry key="jaxb.additionalContextClasses">
+                <bean
+                    class="org.apache.cxf.xkms.model.extensions.ClassArrayFactoryBean">
+                    <property name="classNames">
+                        <list>
+                            <value>org.apache.cxf.xkms.model.extensions.ResultDetails</value>
+                        </list>
+                    </property>
+                </bean>
+            </entry>
+        </jaxws:properties>
+    </jaxws:endpoint>
 
 </beans>



Mime
View raw message