Mailing-List: contact cxf-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
Reply-To: cxf-dev@incubator.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r559311 - in /incubator/cxf/trunk/tools/wsdlto:
 core/src/main/java/org/apache/cxf/tools/wsdlto/
 core/src/main/java/org/apache/cxf/tools/wsdlto/core/
 frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customiztion/
 misc/...
Date: Wed, 25 Jul 2007 04:22:58 -0000
To: cxf-commits@incubator.apache.org
From: mmao@apache.org
Message-Id: <20070725042259.1511E1A981A@eris.apache.org>

Author: mmao
Date: Tue Jul 24 21:22:49 2007
New Revision: 559311

URL: http://svn.apache.org/viewvc?view=rev&rev=559311
Log:
CXF-770
Fixed messages in messages.properties


Modified:
    incubator/cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/Messages.properties
    incubator/cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/Messages.properties
    incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customiztion/CustomizationParser.java
    incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customiztion/Messages.properties
    incubator/cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/Messages.properties
    incubator/cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/WSDLToSoapProcessor.java

Modified: incubator/cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/Messages.properties
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/Messages.properties?view=diff&rev=559311&r1=559310&r2=559311
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/Messages.properties (original)
+++ incubator/cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/Messages.properties Tue Jul 24 21:22:49 2007
@@ -23,8 +23,7 @@
 FILE_NOT_EXIST = File does not exist : {0}
 NOT_A_FILE = {0} is not a file
 PARAMETER_MISSING = Required parameter is missing
-SERVICE_NOT_FOUND = There is no service in wsdl : {0}
-
+SERVICE_NOT_FOUND = No service was found in wsdl : {0}
 
 
 FOUND_NO_DATABINDING = Can not find databinding

Modified: incubator/cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/Messages.properties
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/Messages.properties?view=diff&rev=559311&r1=559310&r2=559311
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/Messages.properties (original)
+++ incubator/cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/Messages.properties Tue Jul 24 21:22:49 2007
@@ -27,7 +27,7 @@
 FRONTEND_MISSING = Can not find {0} frontend in the system
 DATABINDING_MISSING = Can not find {0} databinding in the system
 LOAD_PROCESSOR_FAILED = Can not load processor {0}
-FAIL_TO_CREATE_JAVA_MODEL = Fail to create java model 
+FAIL_TO_CREATE_JAVA_MODEL = Failed to create java model
 
 FOUND_FRONTENDS =  Found {1} frontends in <{0}> plugin.
 LOADING_FRONTEND = Loading <{0}> frontend from <{1}> plugin.
@@ -37,7 +37,7 @@
 LOADING_DATABINDING = Loading <{0}> databinding from <{1}> plugin.
 DATABINDING_MISSING_NAME = Databinding must have a name, can not load THIS databinding from <{0}> plugin.
 LOAD_CONTAINER_CLASS_FAILED = Tools can not load the container class : {0}
-NO_SERVICE_IN_DEFINITION = There is no service in this wsdl : {0}
+NO_SERVICE_IN_DEFINITION = No service was found in this wsdl: {0}
 CAN_NOT_FIND_SERVICE = Can not find the service : {0} in wsdl :{1}
 
 FOUND_NO_PLUGINS = WSDLTo tools can not find any plugins defined in the classpath.

Modified: incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customiztion/CustomizationParser.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customiztion/CustomizationParser.java?view=diff&rev=559311&r1=559310&r2=559311
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customiztion/CustomizationParser.java (original)
+++ incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customiztion/CustomizationParser.java Tue Jul 24 21:22:49 2007
@@ -92,7 +92,7 @@
             try {
                 addBinding(bindingFiles[i]);
             } catch (XMLStreamException xse) {
-                Message msg = new Message("STAX_PASER_ERROR", LOG);
+                Message msg = new Message("STAX_PARSER_ERROR", LOG);
                 throw new ToolException(msg, xse);
             }
         }

Modified: incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customiztion/Messages.properties
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customiztion/Messages.properties?view=diff&rev=559311&r1=559310&r2=559311
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customiztion/Messages.properties (original)
+++ incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customiztion/Messages.properties Tue Jul 24 21:22:49 2007
@@ -18,18 +18,18 @@
 #    under the License.
 #
 #
-STAX_PASER_ERROR = StAX parser error, check your external binding file(s)
+STAX_PARSER_ERROR = StAX parser error, check your external binding file(s)
 PARSE_BINDINGFILE_EXCEPTION = Exception while parsing external jaxws binding file(s)
 UNKNOWN_BINDING_FILE= Unknown external binding files : {0}
 NOT_POINTTO_URL = External binding file: {0} does not point to the specified wsdl url:{1}
 CAN_NOT_GET_WSDL_LOCATION = Can not get this wsdl
-JAXWSBINDINGS_WSDLLOC_ERROR = Attribute wsdlLocation value {0} in jaxws binding element is not an uri
+JAXWSBINDINGS_WSDLLOC_ERROR = Attribute wsdlLocation value {0} in jaxws binding element is not an URI
 JAXWSBINDINGS_NOT_BIND = JAXWSBidnings do not bind to any wsdl.Check the wsdlLocation attribute in the JAXWSBindings element
-ERROR_TARGETNODE_WITH_XPATH = The xpath query identifies mutil or none target nodes with the query expression : {0}
+ERROR_TARGETNODE_WITH_XPATH = XPath query {0} is identifying either multiple or no target nodes.
 XPATH_ERROR = XPath query error , check the query expression : {0}
 NOT_URI = Can not construct new URI with this string : {0}
 FILE_NOT_FOUND = Can not found the file : {0}
 CAN_NOT_READ_AS_ELEMENT = Can not read this file to a xml element : {0}
 WSDL_HASNOCONTENT = Can not read content from the wsdl : {0}
 
- NODE_NOT_EXISTS = Can not find the node with the xpath {0}
\ No newline at end of file
+NODE_NOT_EXISTS = Can not find any node with the XPath {0}
\ No newline at end of file

Modified: incubator/cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/Messages.properties
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/Messages.properties?view=diff&rev=559311&r1=559310&r2=559311
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/Messages.properties (original)
+++ incubator/cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/Messages.properties Tue Jul 24 21:22:49 2007
@@ -18,7 +18,7 @@
 #    under the License.
 #
 #
-SOAP12_UNSUPPORTED = Currently SOAP1.2 is unsupported  
+SOAP12_UNSUPPORTED = Currently SOAP1.2 is unsupported
 PARAMETER_ALREADY_EXIST = Parameter : {0} already exist in the wsdl model
 EXCEPTION_ALREADY_EXIST = Exception : {0} already exist in the wsdl model
 MIMEPART_CANNOT_MAP = MIME part: {0} could not be mapped to available parts in portType!"
@@ -38,17 +38,17 @@
 FAIL_TO_CLOSE_WSDL_FILE = Fail to close wsdl file
 BINDING_ALREADY_EXIST = Input binding already exist in imported contract
 PORTTYPE_NOT_EXIST = Input port type does not exist in imported contract
-SOAPBINDING_STYLE_NOT_PROVIEDED = For rpc style binding, soap binding namespace (-n) must be provided
+SOAPBINDING_STYLE_NOT_PROVIDED = For rpc style binding, soap binding namespace (-n) must be provided
 FAIL_TO_CREATE_SOAPBINDING = Fail to create soapbinding
 FAIL_TO_CREATE_XMLBINDING = Fail to create xml binding
 FAIL_TO_CREATE_SOAP_ADDRESS = Fail to create soap address
 FAIL_TO_OPEN_XSD_FILE = Failed to open XSD file {0}
 SKIP_OVERLOADED_OPERATION=Skipping overloaded operation: {0}
 NO_INPUT_MESSAGE=Problem outputting method for {0} as no input message was found for input named {1}
-FAIL_TO_GET_WSDL = Can not get WSDL location from {0} 
-BINDING_STYLE_NOT_DEFINED = Operation binding style must be defined 
+FAIL_TO_GET_WSDL = Can not get WSDL location from {0}
+BINDING_STYLE_NOT_DEFINED = Operation binding style must be defined
 FAIL_TO_PARSE_TOOLSPEC = Fail to parse the tool spec file
-RPC_PART_ILLEGAL = Message Part {0} does not use type reference not confirm to RPC style   
+RPC_PART_ILLEGAL = Message Part {0} does not use type reference (does not conform to RPC style)
 FAIL_TO_CREATE_SCHEMA_EXTENSION = Fail to create schema extension
 FOUND_NO_WSDL_PLUGIN = Can not found wsdl plugin <{0}> for wsdl extension point {1}
 FOUND_WSDL_PLUGINS = Found wsdl plugins {0}

Modified: incubator/cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/WSDLToSoapProcessor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/WSDLToSoapProcessor.java?view=diff&rev=559311&r1=559310&r2=559311
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/WSDLToSoapProcessor.java (original)
+++ incubator/cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/WSDLToSoapProcessor.java Tue Jul 24 21:22:49 2007
@@ -70,7 +70,7 @@
     }
 
     private boolean isSOAP12() {
-        return env.optionSet(ToolConstants.CFG_SOAP12);        
+        return env.optionSet(ToolConstants.CFG_SOAP12);
     }
 
     private void validate() throws ToolException {
@@ -83,7 +83,7 @@
             throw new ToolException(msg);
         }
         if (!nameSpaceCheck()) {
-            Message msg = new Message("SOAPBINDING_STYLE_NOT_PROVIEDED", LOG);
+            Message msg = new Message("SOAPBINDING_STYLE_NOT_PROVIDED", LOG);
             throw new ToolException(msg);
         }
         if (WSDLConstants.RPC.equalsIgnoreCase((String)env.get(ToolConstants.CFG_STYLE))) {
@@ -197,7 +197,7 @@
         }
 
         SOAPBindingUtil.addSOAPNamespace(wsdlDefinition, isSOAP12());
-        
+
         SoapBinding soapBinding = null;
         try {
             soapBinding = SOAPBindingUtil.createSoapBinding(extReg, isSOAP12());
@@ -245,7 +245,7 @@
             extReg = wsdlFactory.newPopulatedExtensionRegistry();
         }
         SoapOperation soapOperation = null;
-        
+
         try {
             soapOperation = SOAPBindingUtil.createSoapOperation(extReg, isSOAP12());
         } catch (WSDLException wse) {