cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From andreasm...@apache.org
Subject svn commit: r540518 - in /incubator/cxf/trunk/rt/ws/policy: pom.xml src/main/resources/META-INF/spring.schemas src/test/java/org/apache/cxf/ws/policy/spring/server.xml
Date Tue, 22 May 2007 10:16:05 GMT
Author: andreasmyth
Date: Tue May 22 03:16:03 2007
New Revision: 540518

URL: http://svn.apache.org/viewvc?view=rev&rev=540518
Log:
[JIRA CXF-662] Made schema for WS-Policy (and related schemas) available to Spring's validating
parser.

Modified:
    incubator/cxf/trunk/rt/ws/policy/pom.xml
    incubator/cxf/trunk/rt/ws/policy/src/main/resources/META-INF/spring.schemas
    incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/spring/server.xml

Modified: incubator/cxf/trunk/rt/ws/policy/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/policy/pom.xml?view=diff&rev=540518&r1=540517&r2=540518
==============================================================================
--- incubator/cxf/trunk/rt/ws/policy/pom.xml (original)
+++ incubator/cxf/trunk/rt/ws/policy/pom.xml Tue May 22 03:16:03 2007
@@ -30,10 +30,6 @@
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
 
-    <properties>
-        <spring.validation.mode>VALIDATION_NONE</spring.validation.mode>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.apache.ws.commons.neethi</groupId>

Modified: incubator/cxf/trunk/rt/ws/policy/src/main/resources/META-INF/spring.schemas
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/policy/src/main/resources/META-INF/spring.schemas?view=diff&rev=540518&r1=540517&r2=540518
==============================================================================
--- incubator/cxf/trunk/rt/ws/policy/src/main/resources/META-INF/spring.schemas (original)
+++ incubator/cxf/trunk/rt/ws/policy/src/main/resources/META-INF/spring.schemas Tue May 22
03:16:03 2007
@@ -1,2 +1,5 @@
-http\://www.w3.org/2006/07/ws-policy=schemas/ws-policy-200607.xsd
-http\://schemas.xmlsoap.org/ws/2004/09/policy=schemas/ws-policy-200409.xsd
\ No newline at end of file
+http\://www.w3.org/2006/07/ws-policy.xsd=schemas/ws-policy-200607.xsd
+http\://schemas.xmlsoap.org/ws/2004/09/policy/ws-policy.xsd=schemas/ws-policy-200409.xsd
+http\://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd=schemas/oasis-200401-wss-wssecurity-secext-1.0.xsd
+http\://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd=schemas/oasis-200401-wss-wssecurity-utility-1.0.xsd
+http\://www.w3.org/2001/xml.xsd=schemas/xml.xsd

Modified: incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/spring/server.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/spring/server.xml?view=diff&rev=540518&r1=540517&r2=540518
==============================================================================
--- incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/spring/server.xml
(original)
+++ incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/spring/server.xml
Tue May 22 03:16:03 2007
@@ -19,29 +19,25 @@
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:http="http://cxf.apache.org/transports/http/configuration"
-	xmlns:wsa="http://cxf.apache.org/ws/addressing"
 	xmlns:jaxws="http://cxf.apache.org/jaxws"
+	xmlns:wsp-200607="http://www.w3.org/2006/07/ws-policy"
+	xmlns:wsp-200409="http://schemas.xmlsoap.org/ws/2004/09/policy"
 	xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
 	xsi:schemaLocation="
+http://www.w3.org/2006/07/ws-policy http://www.w3.org/2006/07/ws-policy.xsd
+http://schemas.xmlsoap.org/ws/2004/09/policy http://schemas.xmlsoap.org/ws/2004/09/policy/ws-policy.xsd
 http://cxf.apache.org/jaxws http://cxf.apache.org/schema/jaxws.xsd
-http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schema/transports/http.xsd
 http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
 	<jaxws:server id="test" abstract="true">
 		<jaxws:features>
-			<wsp:Policy wsp:Name="test"
-				xmlns:wsp="http://www.w3.org/2006/07/ws-policy">
-
-			</wsp:Policy>
+			<wsp-200607:Policy Name="test"/>
 		</jaxws:features>
 	</jaxws:server>
 
 	<jaxws:server id="test2004" abstract="true">
 		<jaxws:features>
-			<wsp:Policy xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
-
-			</wsp:Policy>
+			<wsp-200409:Policy/>
 		</jaxws:features>
 	</jaxws:server>
 
@@ -51,7 +47,6 @@
 		</jaxws:features>
 	</jaxws:server>
 	
-	<wsp:Policy wsu:Id="External"
-				xmlns:wsp="http://www.w3.org/2006/07/ws-policy"/>
+	<wsp-200607:Policy wsu:Id="External"/>
 
 </beans>



Mime
View raw message