cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From andreasm...@apache.org
Subject svn commit: r544576 - in /incubator/cxf/trunk: common/common/src/main/java/org/apache/cxf/configuration/spring/ rt/frontend/jaxws/ rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/ rt/frontend/jaxws/src/main/resources/META-INF/ rt/frontend/j...
Date Tue, 05 Jun 2007 17:52:57 GMT
Author: andreasmyth
Date: Tue Jun  5 10:52:56 2007
New Revision: 544576

URL: http://svn.apache.org/viewvc?view=rev&rev=544576
Log:
[JIRA CXF-674] for elements in http://cxf.apache.org/jaxws namespace: using cxf-beans:beanAttributes
attribute group. Changed jaxws schema URI from http://cxf.apache.org/schema/jaxws.xsd to http://cxf.apache.org/schemas/jaxws.xsd
and moved schema into resources/schemas directory.


Added:
    incubator/cxf/trunk/rt/frontend/jaxws/src/main/resources/schemas/
    incubator/cxf/trunk/rt/frontend/jaxws/src/main/resources/schemas/jaxws.xsd
      - copied, changed from r544432, incubator/cxf/trunk/rt/frontend/jaxws/src/main/resources/org/apache/cxf/jaxws/spring/jaxws.xsd
Removed:
    incubator/cxf/trunk/rt/frontend/jaxws/src/main/resources/org/apache/cxf/jaxws/spring/jaxws.xsd
Modified:
    incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java
    incubator/cxf/trunk/rt/frontend/jaxws/pom.xml
    incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/EndpointDefinitionParser.java
    incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/JaxWsProxyFactoryBeanDefinitionParser.java
    incubator/cxf/trunk/rt/frontend/jaxws/src/main/resources/META-INF/spring.schemas
    incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/configured-endpoints.xml
    incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/soapServiceConfig.xml
    incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/clients.xml
    incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/endpoints.xml
    incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/servers.xml
    incubator/cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/spring/server.xml
    incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/spring/server.xml
    incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/cxf-servlet.xml
    incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/restful_service.xml
    incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/spring.xml

Modified: incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java?view=diff&rev=544576&r1=544575&r2=544576
==============================================================================
--- incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java
(original)
+++ incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java
Tue Jun  5 10:52:56 2007
@@ -27,9 +27,7 @@
 import javax.xml.namespace.QName;
 
 
-import org.w3c.dom.Attr;
 import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
@@ -53,28 +51,16 @@
         
         // REVISIT: use getAttributeNS instead
         
-        String id = elem.getAttribute(BeanDefinitionParserDelegate.ID_ATTRIBUTE);
+        String id = getIdOrName(elem);
         String createdFromAPI = elem.getAttribute(BeanConstants.CREATED_FROM_API_ATTR);
         
         if (null == id || "".equals(id)) {
-            String names = elem.getAttribute(BeanConstants.NAME_ATTR);
-            if (null != names) {
-                StringTokenizer st = 
-                    new StringTokenizer(names, BeanDefinitionParserDelegate.BEAN_NAME_DELIMITERS);
-                if (st.countTokens() > 0) {
-                    id = st.nextToken();
-                }
-            }
-        }
-        
-        if (null == id || "".equals(id)) {
             return super.resolveId(elem, definition, ctx);
         } 
         
         if (createdFromAPI != null && "true".equals(createdFromAPI.toLowerCase()))
{
             return id + getSuffix();
         }
-        
         return id;        
     }
 
@@ -256,6 +242,7 @@
         return new QName(ns, local, pre);
     }
 
+    /*
     protected final void doParseCommon(Element elem, ParserContext ctx, BeanDefinitionBuilder
builder) {
         NamedNodeMap atts = elem.getAttributes();
         
@@ -272,6 +259,23 @@
                 }
             }
         }
-    }   
+    } 
+    */
+    
+    protected final String getIdOrName(Element elem) {
+        String id = elem.getAttribute(BeanDefinitionParserDelegate.ID_ATTRIBUTE);
+        
+        if (null == id || "".equals(id)) {
+            String names = elem.getAttribute(BeanConstants.NAME_ATTR);
+            if (null != names) {
+                StringTokenizer st = 
+                    new StringTokenizer(names, BeanDefinitionParserDelegate.BEAN_NAME_DELIMITERS);
+                if (st.countTokens() > 0) {
+                    id = st.nextToken();
+                }
+            }
+        }
+        return id;
+    }
 
 }

Modified: incubator/cxf/trunk/rt/frontend/jaxws/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/pom.xml?view=diff&rev=544576&r1=544575&r2=544576
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/pom.xml (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/pom.xml Tue Jun  5 10:52:56 2007
@@ -32,10 +32,6 @@
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
 
-    <properties>
-        <spring.validation.mode>VALIDATION_NONE</spring.validation.mode>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>junit</groupId>

Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/EndpointDefinitionParser.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/EndpointDefinitionParser.java?view=diff&rev=544576&r1=544575&r2=544576
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/EndpointDefinitionParser.java
(original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/EndpointDefinitionParser.java
Tue Jun  5 10:52:56 2007
@@ -69,7 +69,7 @@
                     bean.addPropertyValue(name, q);
                 } else if (IMPLEMENTOR.equals(name)) {
                     loadImplementor(bean, val);
-                } else {
+                } else if (!"name".equals(name)) {
                     mapToProperty(bean, name, val);
                 }
             } else if ("abstract".equals(name)) {

Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/JaxWsProxyFactoryBeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/JaxWsProxyFactoryBeanDefinitionParser.java?view=diff&rev=544576&r1=544575&r2=544576
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/JaxWsProxyFactoryBeanDefinitionParser.java
(original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/JaxWsProxyFactoryBeanDefinitionParser.java
Tue Jun  5 10:52:56 2007
@@ -46,8 +46,7 @@
         
         BeanDefinitionBuilder bean = BeanDefinitionBuilder.rootBeanDefinition(JaxWsProxyFactoryBean.class);
 
-        NamedNodeMap atts = element.getAttributes();
-        String id = null;
+        NamedNodeMap atts = element.getAttributes();        
         boolean createdFromAPI = false;
         boolean setBus = false;
         for (int i = 0; i < atts.getLength(); i++) {
@@ -64,14 +63,12 @@
                 if ("endpointName".equals(name) || "serviceName".equals(name)) {
                     QName q = parseQName(element, val);
                     bean.addPropertyValue(name, q);
-                } else {
+                } else if (!"name".equals(name)) {
                     if ("bus".equals(name)) {
                         setBus = true;
                     }
                     mapToProperty(bean, name, val);
                 }
-            } else if ("id".equals(name)) {
-                id = val;
             } else if ("abstract".equals(name)) {
                 bean.setAbstract(true);
                 clientBean.setAbstract(true);
@@ -100,13 +97,13 @@
                 }
             }
         }
+        String id = getIdOrName(element);
         if (createdFromAPI) {
             id = id + getSuffix();
         }
         String factoryId = id + ".proxyFactory";
         
         ctx.getRegistry().registerBeanDefinition(factoryId, bean.getBeanDefinition());
-        
         clientBean.getBeanDefinition().setAttribute("id", id);
         clientBean.setFactoryBean(factoryId, "create");
     }

Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/main/resources/META-INF/spring.schemas
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/resources/META-INF/spring.schemas?view=diff&rev=544576&r1=544575&r2=544576
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/main/resources/META-INF/spring.schemas (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/main/resources/META-INF/spring.schemas Tue Jun
 5 10:52:56 2007
@@ -1 +1 @@
-http\://cxf.apache.org/schema/jaxws.xsd=org/apache/cxf/jaxws/spring/jaxws.xsd
\ No newline at end of file
+http\://cxf.apache.org/schemas/jaxws.xsd=schemas/jaxws.xsd
\ No newline at end of file

Copied: incubator/cxf/trunk/rt/frontend/jaxws/src/main/resources/schemas/jaxws.xsd (from r544432,
incubator/cxf/trunk/rt/frontend/jaxws/src/main/resources/org/apache/cxf/jaxws/spring/jaxws.xsd)
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/resources/schemas/jaxws.xsd?view=diff&rev=544576&p1=incubator/cxf/trunk/rt/frontend/jaxws/src/main/resources/org/apache/cxf/jaxws/spring/jaxws.xsd&r1=544432&p2=incubator/cxf/trunk/rt/frontend/jaxws/src/main/resources/schemas/jaxws.xsd&r2=544576
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/main/resources/org/apache/cxf/jaxws/spring/jaxws.xsd
(original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/main/resources/schemas/jaxws.xsd Tue Jun  5
10:52:56 2007
@@ -2,13 +2,14 @@
 <xsd:schema xmlns="http://www.springframework.org/schema/myns"
   xmlns:xsd="http://www.w3.org/2001/XMLSchema"
   xmlns:beans="http://www.springframework.org/schema/beans"
+  xmlns:cxf-beans="http://cxf.apache.org/configuration/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd"
   targetNamespace="http://cxf.apache.org/jaxws" 
   elementFormDefault="qualified"
   attributeFormDefault="unqualified"  >
 
-  <xsd:import namespace="http://www.springframework.org/schema/beans" />
+  <xsd:import namespace="http://www.springframework.org/schema/beans" schemaLocation="http://www.springframework.org/schema/beans/spring-beans.xsd"/>
+  <xsd:import namespace="http://cxf.apache.org/configuration/beans" schemaLocation="http://cxf.apache.org/schemas/configuration/cxf-beans.xsd"/>
 
   <xsd:element name="endpoint">
     <xsd:complexType>
@@ -26,9 +27,8 @@
             <xsd:element name="properties" type="beans:mapType" minOccurs="0"/>
             <xsd:element name="serviceFactory" type="xsd:anyType" minOccurs="0"/>
           </xsd:sequence>
-          <xsd:attribute name="abstract" type="xsd:boolean" />
+          <xsd:attributeGroup ref="cxf-beans:beanAttributes"/>
           <xsd:attribute name="address" type="xsd:string" />
-          <xsd:attribute name="createdFromAPI" type="xsd:string" />
           <xsd:attribute name="bindingUri" type="xsd:string" />
           <xsd:attribute name="bus" type="xsd:string" />
           <xsd:attribute name="implementor" type="xsd:string"/>
@@ -59,10 +59,9 @@
             <xsd:element name="serviceBean" type="xsd:anyType" minOccurs="0"/>
             <xsd:element name="serviceFactory" type="xsd:anyType" minOccurs="0"/>
           </xsd:sequence>
-          <xsd:attribute name="abstract" type="xsd:boolean" />
+          <xsd:attributeGroup ref="cxf-beans:beanAttributes"/>
           <xsd:attribute name="address" type="xsd:string" />
           <xsd:attribute name="bus" type="xsd:string" />
-          <xsd:attribute name="createdFromAPI" type="xsd:string" />
           <xsd:attribute name="serviceClass" type="xsd:string"/>
           <xsd:attribute name="serviceBean" type="xsd:string"/>
           <xsd:attribute name="start" type="xsd:boolean" default="true"/>
@@ -87,11 +86,10 @@
             <xsd:element name="properties" type="beans:mapType" minOccurs="0"/>
             <xsd:element name="conduitSelector" type="xsd:anyType" minOccurs="0"/>
           </xsd:sequence>
-          <xsd:attribute name="abstract" type="xsd:boolean" />
+          <xsd:attributeGroup ref="cxf-beans:beanAttributes"/>
           <xsd:attribute name="address" type="xsd:string" />
           <xsd:attribute name="bindingUri" type="xsd:string" />
           <xsd:attribute name="bus" type="xsd:string" />
-          <xsd:attribute name="createdFromAPI" type="xsd:string" />
           <xsd:attribute name="endpointName" type="xsd:QName" />
           <xsd:attribute name="password" type="xsd:string" />
           <xsd:attribute name="serviceClass" type="xsd:QName" />

Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/configured-endpoints.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/configured-endpoints.xml?view=diff&rev=544576&r1=544575&r2=544576
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/configured-endpoints.xml
(original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/configured-endpoints.xml
Tue Jun  5 10:52:56 2007
@@ -21,11 +21,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:foo="http://cxf.apache.org/configuration/foo"
     xmlns:jaxws="http://cxf.apache.org/jaxws"
-    xmlns:soap="http://cxf.apache.org/bindings/soap"
     xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-http://cxf.apache.org/bindings/soap http://cxf.apache.org/schema/bindings/soap.xsd
-http://cxf.apache.org/jaxws http://cxf.apache.org/schema/jaxws.xsd">
+http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
 
 	<bean name="{http://apache.org/hello_world_soap_http}SOAPService"
 		abstract="true">
@@ -63,23 +61,23 @@
 		</property>
 	</bean>
 
-	<jaxws:endpoint id="{http://apache.org/hello_world_soap_http}SoapPort"
+	<jaxws:endpoint name="{http://apache.org/hello_world_soap_http}SoapPort"
 		createdFromAPI="true">
 		<jaxws:inInterceptors>
 			<bean class="org.apache.cxf.jaxws.ConfiguredEndpointTest$TestInterceptor">
 				<property name="name" value="endpoint-in" />
 			</bean>
 		</jaxws:inInterceptors>
-		<jaxws:outInterceptors>
-			<bean class="org.apache.cxf.jaxws.ConfiguredEndpointTest$TestInterceptor">
-				<property name="name" value="endpoint-out" />
-			</bean>
-		</jaxws:outInterceptors>
 		<jaxws:inFaultInterceptors>
 			<bean class="org.apache.cxf.jaxws.ConfiguredEndpointTest$TestInterceptor">
 				<property name="name" value="endpoint-in-fault" />
 			</bean>
 		</jaxws:inFaultInterceptors>
+		<jaxws:outInterceptors>
+			<bean class="org.apache.cxf.jaxws.ConfiguredEndpointTest$TestInterceptor">
+				<property name="name" value="endpoint-out" />
+			</bean>
+		</jaxws:outInterceptors>		
 		<jaxws:outFaultInterceptors>
 			<bean class="org.apache.cxf.jaxws.ConfiguredEndpointTest$TestInterceptor">
 				<property name="name" value="endpoint-out-fault" />

Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/soapServiceConfig.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/soapServiceConfig.xml?view=diff&rev=544576&r1=544575&r2=544576
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/soapServiceConfig.xml
(original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/soapServiceConfig.xml
Tue Jun  5 10:52:56 2007
@@ -20,14 +20,12 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xmlns:jaxws="http://cxf.apache.org/jaxws"
-      xmlns:soap="http://cxf.apache.org/bindings/soap"
       xsi:schemaLocation="
 http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-http://cxf.apache.org/bindings/soap http://cxf.apache.org/schema/bindings/soap.xsd
-http://cxf.apache.org/jaxws http://cxf.apache.org/schema/jaxws.xsd">
+http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
 
   
-  <jaxws:client id="{http://apache.org/hello_world_soap_http}SoapPort" createdFromAPI="true">
+  <jaxws:client name="{http://apache.org/hello_world_soap_http}SoapPort" createdFromAPI="true">
      <jaxws:properties>
       <entry key="foo" value="bar"/>
     </jaxws:properties>

Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/clients.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/clients.xml?view=diff&rev=544576&r1=544575&r2=544576
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/clients.xml
(original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/clients.xml
Tue Jun  5 10:52:56 2007
@@ -20,11 +20,9 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xmlns:jaxws="http://cxf.apache.org/jaxws"
-      xmlns:soap="http://cxf.apache.org/bindings/soap"
       xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-http://cxf.apache.org/bindings/soap http://cxf.apache.org/schema/bindings/soap.xsd
-http://cxf.apache.org/jaxws http://cxf.apache.org/schema/jaxws.xsd">
+http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
 
   <import resource="classpath:META-INF/cxf/cxf.xml"/>
   <import resource="classpath:META-INF/cxf/cxf-extension-soap.xml"/>

Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/endpoints.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/endpoints.xml?view=diff&rev=544576&r1=544575&r2=544576
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/endpoints.xml
(original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/endpoints.xml
Tue Jun  5 10:52:56 2007
@@ -20,11 +20,9 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xmlns:jaxws="http://cxf.apache.org/jaxws"
-      xmlns:soap="http://cxf.apache.org/bindings/soap"
       xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-http://cxf.apache.org/bindings/soap http://cxf.apache.org/schema/bindings/soap.xsd
-http://cxf.apache.org/jaxws http://cxf.apache.org/schema/jaxws.xsd">
+http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
 
   <import resource="classpath:META-INF/cxf/cxf.xml"/>
   <import resource="classpath:META-INF/cxf/cxf-extension-soap.xml"/>

Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/servers.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/servers.xml?view=diff&rev=544576&r1=544575&r2=544576
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/servers.xml
(original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/servers.xml
Tue Jun  5 10:52:56 2007
@@ -24,7 +24,7 @@
       xsi:schemaLocation="
 http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
 http://cxf.apache.org/bindings/soap http://cxf.apache.org/schema/bindings/soap.xsd
-http://cxf.apache.org/jaxws http://cxf.apache.org/schema/jaxws.xsd">
+http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
 
   <import resource="classpath:META-INF/cxf/cxf.xml"/>
   <import resource="classpath:META-INF/cxf/cxf-extension-soap.xml"/>

Modified: incubator/cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/spring/server.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/spring/server.xml?view=diff&rev=544576&r1=544575&r2=544576
==============================================================================
--- incubator/cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/spring/server.xml
(original)
+++ incubator/cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/spring/server.xml
Tue Jun  5 10:52:56 2007
@@ -24,7 +24,7 @@
        xmlns:jaxws="http://cxf.apache.org/jaxws"
        xsi:schemaLocation="
 http://cxf.apache.org/ws/addressing http://cxf.apache.org/schema/ws/addressing.xsd
-http://cxf.apache.org/jaxws http://cxf.apache.org/schema/jaxws.xsd
+http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/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">
   

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=544576&r1=544575&r2=544576
==============================================================================
--- 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 Jun  5 10:52:56 2007
@@ -26,7 +26,7 @@
 	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/jaxws http://cxf.apache.org/schemas/jaxws.xsd
 http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
 	<jaxws:server id="test" abstract="true">

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/cxf-servlet.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/cxf-servlet.xml?view=diff&rev=544576&r1=544575&r2=544576
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/cxf-servlet.xml
(original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/cxf-servlet.xml
Tue Jun  5 10:52:56 2007
@@ -23,7 +23,7 @@
       xmlns:soap="http://cxf.apache.org/bindings/soap"
       xsi:schemaLocation="
 http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-http://cxf.apache.org/jaxws http://cxf.apache.org/schema/jaxws.xsd">
+http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
   
   <jaxws:endpoint 
     id="greeter1" 

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/restful_service.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/restful_service.xml?view=diff&rev=544576&r1=544575&r2=544576
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/restful_service.xml
(original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/restful_service.xml
Tue Jun  5 10:52:56 2007
@@ -22,7 +22,7 @@
       xmlns:jaxws="http://cxf.apache.org/jaxws"
       xsi:schemaLocation="
 http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-http://cxf.apache.org/jaxws http://cxf.apache.org/schema/jaxws.xsd">
+http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
 
   <import resource="classpath:META-INF/cxf/cxf.xml"/>
   <import resource="classpath:META-INF/cxf/cxf-extension-soap.xml"/>

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/spring.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/spring.xml?view=diff&rev=544576&r1=544575&r2=544576
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/spring.xml (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/spring.xml Tue
Jun  5 10:52:56 2007
@@ -22,7 +22,7 @@
       xmlns:jaxws="http://cxf.apache.org/jaxws"
       xsi:schemaLocation="
 http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-http://cxf.apache.org/jaxws http://cxf.apache.org/schema/jaxws.xsd">
+http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
 
   <import resource="classpath:META-INF/cxf/cxf.xml"/>
   <import resource="classpath:META-INF/cxf/cxf-extension-soap.xml"/>



Mime
View raw message