Author: gmazza
Date: Tue Jan 11 20:28:51 2011
New Revision: 1057850
URL: http://svn.apache.org/viewvc?rev=1057850&view=rev
Log:
Switch jaxws systest schema from French to English.
Modified:
cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/SchemaValidationClientServerTest.java
cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ServicePortTypeImpl.java
cxf/trunk/systests/jaxws/src/test/resources/wsdl_systest_jaxws/request.xsd
cxf/trunk/systests/jaxws/src/test/resources/wsdl_systest_jaxws/response-in.xsd
cxf/trunk/systests/jaxws/src/test/resources/wsdl_systest_jaxws/response.xsd
cxf/trunk/systests/jaxws/src/test/resources/wsdl_systest_jaxws/schemaValidation.wsdl
Modified:
cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/SchemaValidationClientServerTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/SchemaValidationClientServerTest.java?rev=1057850&r1=1057849&r2=1057850&view=diff
==============================================================================
---
cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/SchemaValidationClientServerTest.java
(original)
+++
cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/SchemaValidationClientServerTest.java
Tue Jan 11 20:28:51 2011
@@ -30,9 +30,9 @@ import org.apache.cxf.frontend.ClientPro
import org.apache.cxf.interceptor.LoggingInInterceptor;
import org.apache.cxf.interceptor.LoggingOutInterceptor;
import org.apache.cxf.jaxws.EndpointImpl;
-import org.apache.cxf.jaxws.schemavalidation.CkReponseType;
-import org.apache.cxf.jaxws.schemavalidation.CkRequeteType;
-import org.apache.cxf.jaxws.schemavalidation.RequeteIdType;
+import org.apache.cxf.jaxws.schemavalidation.CkRequestType;
+import org.apache.cxf.jaxws.schemavalidation.CkResponseType;
+import org.apache.cxf.jaxws.schemavalidation.RequestIdType;
import org.apache.cxf.jaxws.schemavalidation.Service;
import org.apache.cxf.jaxws.schemavalidation.ServicePortType;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
@@ -91,13 +91,13 @@ public class SchemaValidationClientServe
ClientProxy.getClient(greeter).getOutInterceptors().add(new
LoggingOutInterceptor());
updateAddressPort(greeter, PORT);
- RequeteIdType requestId = new RequeteIdType();
+ RequestIdType requestId = new RequestIdType();
requestId.setId("ffang");
- CkRequeteType request = new CkRequeteType();
- request.setRequete(requestId);
+ CkRequestType request = new CkRequestType();
+ request.setRequest(requestId);
((BindingProvider)greeter).getRequestContext().put("schema-validation-enabled",
Boolean.TRUE);
- CkReponseType response = greeter.ckR(request);
- assertEquals(response.getProduit().get(0).getAction().getStatus(), 4);
+ CkResponseType response = greeter.ckR(request);
+ assertEquals(response.getProduct().get(0).getAction().getStatus(), 4);
}
Modified:
cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ServicePortTypeImpl.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ServicePortTypeImpl.java?rev=1057850&r1=1057849&r2=1057850&view=diff
==============================================================================
---
cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ServicePortTypeImpl.java
(original)
+++
cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ServicePortTypeImpl.java
Tue Jan 11 20:28:51 2011
@@ -19,21 +19,21 @@
package org.apache.cxf.systest.jaxws;
import org.apache.cxf.jaxws.schemavalidation.ActionCheckMajType;
-import org.apache.cxf.jaxws.schemavalidation.CkReponseType;
-import org.apache.cxf.jaxws.schemavalidation.CkRequeteType;
-import org.apache.cxf.jaxws.schemavalidation.ProduitPosteActionType;
+import org.apache.cxf.jaxws.schemavalidation.CkRequestType;
+import org.apache.cxf.jaxws.schemavalidation.CkResponseType;
+import org.apache.cxf.jaxws.schemavalidation.ProductPostActionType;
import org.apache.cxf.jaxws.schemavalidation.ServicePortType;
@javax.xml.ws.BindingType(value =
"http://www.w3.org/2003/05/soap/bindings/HTTP/";)
public class ServicePortTypeImpl implements ServicePortType {
- public CkReponseType ckR(CkRequeteType ckRIn) {
- CkReponseType result = new CkReponseType();
+ public CkResponseType ckR(CkRequestType ckRIn) {
+ CkResponseType result = new CkResponseType();
ActionCheckMajType action = new ActionCheckMajType();
action.setStatus(4);
- ProduitPosteActionType pdt = new ProduitPosteActionType();
+ ProductPostActionType pdt = new ProductPostActionType();
pdt.setAction(action);
- result.getProduit().add(pdt);
+ result.getProduct().add(pdt);
return result;
}
}
Modified:
cxf/trunk/systests/jaxws/src/test/resources/wsdl_systest_jaxws/request.xsd
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/jaxws/src/test/resources/wsdl_systest_jaxws/request.xsd?rev=1057850&r1=1057849&r2=1057850&view=diff
==============================================================================
--- cxf/trunk/systests/jaxws/src/test/resources/wsdl_systest_jaxws/request.xsd
(original)
+++ cxf/trunk/systests/jaxws/src/test/resources/wsdl_systest_jaxws/request.xsd
Tue Jan 11 20:28:51 2011
@@ -15,9 +15,9 @@
-->
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema";
xmlns="http://cxf.apache.org/jaxws/schemavalidation";
targetNamespace="http://cxf.apache.org/jaxws/schemavalidation";
elementFormDefault="qualified">
- <xsd:element name="ckRequete" type="ckRequeteType">
+ <xsd:element name="ckRequest" type="ckRequestType">
</xsd:element>
- <xsd:complexType name="requeteIdType">
+ <xsd:complexType name="requestIdType">
<xsd:attribute name="id" type="GUIDType" use="required">
</xsd:attribute>
</xsd:complexType>
@@ -27,9 +27,9 @@
</xsd:restriction>
</xsd:simpleType>
- <xsd:complexType name="ckRequeteType">
+ <xsd:complexType name="ckRequestType">
<xsd:sequence>
- <xsd:element name="requete" type="requeteIdType">
+ <xsd:element name="request" type="requestIdType">
</xsd:element>
</xsd:sequence>
</xsd:complexType>
Modified:
cxf/trunk/systests/jaxws/src/test/resources/wsdl_systest_jaxws/response-in.xsd
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/jaxws/src/test/resources/wsdl_systest_jaxws/response-in.xsd?rev=1057850&r1=1057849&r2=1057850&view=diff
==============================================================================
---
cxf/trunk/systests/jaxws/src/test/resources/wsdl_systest_jaxws/response-in.xsd
(original)
+++
cxf/trunk/systests/jaxws/src/test/resources/wsdl_systest_jaxws/response-in.xsd
Tue Jan 11 20:28:51 2011
@@ -16,12 +16,12 @@
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema";
xmlns="http://cxf.apache.org/jaxws/schemavalidation";
targetNamespace="http://cxf.apache.org/jaxws/schemavalidation";
elementFormDefault="qualified">
- <xsd:complexType name="ckReponseType">
+ <xsd:complexType name="ckResponseType">
<xsd:sequence>
- <xsd:element name="produit"
type="produitPosteActionType" minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:element name="product"
type="productPostActionType" minOccurs="0" maxOccurs="unbounded"/>
</xsd:sequence>
</xsd:complexType>
- <xsd:complexType name="produitPosteActionType">
+ <xsd:complexType name="productPostActionType">
<xsd:sequence>
<xsd:element name="action" type="actionCheckMajType"/>
</xsd:sequence>
Modified:
cxf/trunk/systests/jaxws/src/test/resources/wsdl_systest_jaxws/response.xsd
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/jaxws/src/test/resources/wsdl_systest_jaxws/response.xsd?rev=1057850&r1=1057849&r2=1057850&view=diff
==============================================================================
--- cxf/trunk/systests/jaxws/src/test/resources/wsdl_systest_jaxws/response.xsd
(original)
+++ cxf/trunk/systests/jaxws/src/test/resources/wsdl_systest_jaxws/response.xsd
Tue Jan 11 20:28:51 2011
@@ -16,6 +16,6 @@
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema";
xmlns="http://cxf.apache.org/jaxws/schemavalidation";
targetNamespace="http://cxf.apache.org/jaxws/schemavalidation";
elementFormDefault="qualified">
<xsd:include schemaLocation="response-in.xsd"/>
- <xsd:element name="ckReponse" type="ckReponseType">
+ <xsd:element name="ckResponse" type="ckResponseType">
</xsd:element>
</xsd:schema>
Modified:
cxf/trunk/systests/jaxws/src/test/resources/wsdl_systest_jaxws/schemaValidation.wsdl
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/jaxws/src/test/resources/wsdl_systest_jaxws/schemaValidation.wsdl?rev=1057850&r1=1057849&r2=1057850&view=diff
==============================================================================
---
cxf/trunk/systests/jaxws/src/test/resources/wsdl_systest_jaxws/schemaValidation.wsdl
(original)
+++
cxf/trunk/systests/jaxws/src/test/resources/wsdl_systest_jaxws/schemaValidation.wsdl
Tue Jan 11 20:28:51 2011
@@ -26,10 +26,10 @@
<wsdl:message name="ckRIn">
- <wsdl:part name="ckRIn" element="tns:ckRequete"/>
+ <wsdl:part name="ckRIn" element="tns:ckRequest"/>
</wsdl:message>
<wsdl:message name="ckROut">
- <wsdl:part name="ckROut" element="tns:ckReponse"/>
+ <wsdl:part name="ckROut" element="tns:ckResponse"/>
</wsdl:message>
