You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by bu...@apache.org on 2001/11/12 17:43:12 UTC
cvs commit: xml-axis/java/test/utils TestMessages.java
butek 01/11/12 08:43:12
Modified: java/src/org/apache/axis/client AdminClient.java
Service.java
java/src/org/apache/axis/server AxisServer.java
java/src/org/apache/axis/suppliers FactorySupplier.java
java/src/org/apache/axis/transport/http HTTPSender.java
java/src/org/apache/axis/transport/local LocalSender.java
java/src/org/apache/axis/utils Admin.java NSStack.java
resources.properties
java/src/org/apache/axis/wsdl Emitter.java
java/test/utils TestMessages.java
Log:
Some final internationalization fixes plus the test that found them.
Revision Changes Path
1.47 +1 -1 xml-axis/java/src/org/apache/axis/client/AdminClient.java
Index: AdminClient.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/client/AdminClient.java,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- AdminClient.java 2001/11/06 19:54:25 1.46
+++ AdminClient.java 2001/11/12 16:43:11 1.47
@@ -101,7 +101,7 @@
Service service = new Service();
call = (Call) service.createCall();
} catch (JAXRPCException e) {
- category.fatal(JavaUtils.getMessage("couldn'tCall00"), e);
+ category.fatal(JavaUtils.getMessage("couldntCall00"), e);
call = null;
}
}
1.21 +2 -2 xml-axis/java/src/org/apache/axis/client/Service.java
Index: Service.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/client/Service.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- Service.java 2001/11/09 00:02:56 1.20
+++ Service.java 2001/11/12 16:43:11 1.21
@@ -264,12 +264,12 @@
Port port = wsdlService.getPort( portName.getLocalPart() );
if ( port == null )
- throw new JAXRPCException( JavaUtils.getMessage("noPort", "" + portName) );
+ throw new JAXRPCException( JavaUtils.getMessage("noPort00", "" + portName) );
Binding binding = port.getBinding();
PortType portType = binding.getPortType();
if ( portType == null )
- throw new JAXRPCException( JavaUtils.getMessage("noPortType", "" + portName) );
+ throw new JAXRPCException( JavaUtils.getMessage("noPortType00", "" + portName) );
org.apache.axis.client.Call call = new org.apache.axis.client.Call(this);
call.setPortTypeName( portName );
1.46 +4 -4 xml-axis/java/src/org/apache/axis/server/AxisServer.java
Index: AxisServer.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/server/AxisServer.java,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- AxisServer.java 2001/11/08 21:43:59 1.45
+++ AxisServer.java 2001/11/12 16:43:11 1.46
@@ -207,7 +207,7 @@
SimpleTargetedChain transportChain = null;
if (category.isInfoEnabled())
- category.info(JavaUtils.getMessage("transport01", hName));
+ category.info(JavaUtils.getMessage("transport01", "AxisServer.invoke", hName));
if ( hName != null && (h = getTransport( hName )) != null ) {
if (h instanceof SimpleTargetedChain) {
@@ -242,7 +242,7 @@
h = msgContext.getServiceHandler();
if (h == null)
throw new AxisFault("Server.NoService",
- JavaUtils.getMessage("noService04",
+ JavaUtils.getMessage("noService05",
"" + msgContext.getTargetService()),
null, null );
}
@@ -347,7 +347,7 @@
SimpleTargetedChain transportChain = null;
if (category.isInfoEnabled())
- category.info(JavaUtils.getMessage("transport01", hName));
+ category.info(JavaUtils.getMessage("transport01", "AxisServer.invoke", hName));
if ( hName != null && (h = getTransport( hName )) != null ) {
if (h instanceof SimpleTargetedChain) {
transportChain = (SimpleTargetedChain)h;
@@ -383,7 +383,7 @@
}
if (h == null)
throw new AxisFault("Server.NoService",
- JavaUtils.getMessage("noService04",
+ JavaUtils.getMessage("noService05",
"" + msgContext.getTargetService()),
null, null );
}
1.11 +1 -1 xml-axis/java/src/org/apache/axis/suppliers/FactorySupplier.java
Index: FactorySupplier.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/suppliers/FactorySupplier.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- FactorySupplier.java 2001/11/08 21:43:59 1.10
+++ FactorySupplier.java 2001/11/12 16:43:11 1.11
@@ -85,7 +85,7 @@
Handler handler = (Handler)_class.newInstance();
handler.setOptions(_options);
if (category.isDebugEnabled())
- category.debug(JavaUtils.getMessage("return00", _class.getName()));
+ category.debug(JavaUtils.getMessage("return00", "FactorySupplier.getHandler", _class.getName()));
return handler;
} catch (IllegalAccessException e1) {
e1.printStackTrace();
1.34 +2 -2 xml-axis/java/src/org/apache/axis/transport/http/HTTPSender.java
Index: HTTPSender.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/transport/http/HTTPSender.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- HTTPSender.java 2001/11/09 14:09:47 1.33
+++ HTTPSender.java 2001/11/12 16:43:11 1.34
@@ -379,14 +379,14 @@
outMsg = new Message( data );
- category.debug( "\n" + JavaUtils.getMessage("xmlrecd00") );
+ category.debug( "\n" + JavaUtils.getMessage("xmlRecd00") );
category.debug( "-----------------------------------------------");
category.debug( xml );
}
else {
outMsg = new Message( inp );
category.debug( "\n" + JavaUtils.getMessage("no00", "Content-Length") );
- category.debug( "\n" + JavaUtils.getMessage("xmlrecd00") );
+ category.debug( "\n" + JavaUtils.getMessage("xmlRecd00") );
category.debug( "-----------------------------------------------");
category.debug( (String) outMsg.getSOAPPart().getAsString() );
}
1.19 +1 -1 xml-axis/java/src/org/apache/axis/transport/local/LocalSender.java
Index: LocalSender.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/transport/local/LocalSender.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- LocalSender.java 2001/11/08 21:43:59 1.18
+++ LocalSender.java 2001/11/12 16:43:11 1.19
@@ -109,7 +109,7 @@
// exercise the serializers.
String msgStr = clientContext.getRequestMessage().getSOAPPart().getAsString();
- category.debug( JavaUtils.getMessage("sendingXML00"));
+ category.debug( JavaUtils.getMessage("sendingXML00", "LocalSender"));
category.debug( msgStr);
serverContext.setRequestMessage(new Message(msgStr));
1.85 +1 -1 xml-axis/java/src/org/apache/axis/utils/Admin.java
Index: Admin.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/utils/Admin.java,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- Admin.java 2001/11/09 23:13:02 1.84
+++ Admin.java 2001/11/12 16:43:11 1.85
@@ -643,7 +643,7 @@
if ( pivot != null && pivot.equals("") ) pivot = null ;
if ( name != null && name.equals("") ) name = null ;
- category.info( JavaUtils.getMessage("deployService00", name) );
+ category.info( JavaUtils.getMessage("deployService01", name) );
String hName = null ;
Handler tmpH = null ;
StringTokenizer st = null ;
1.15 +1 -1 xml-axis/java/src/org/apache/axis/utils/NSStack.java
Index: NSStack.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/utils/NSStack.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- NSStack.java 2001/11/08 21:43:59 1.14
+++ NSStack.java 2001/11/12 16:43:11 1.15
@@ -199,7 +199,7 @@
return parent.getNamespaceURI(prefix);
if (category.isDebugEnabled()){
- category.debug(JavaUtils.getMessage("noPrefix00", prefix));
+ category.debug(JavaUtils.getMessage("noPrefix00", "" + this, prefix));
dump();
}
1.12 +4 -2 xml-axis/java/src/org/apache/axis/utils/resources.properties
Index: resources.properties
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/utils/resources.properties,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- resources.properties 2001/11/09 17:41:03 1.11
+++ resources.properties 2001/11/12 16:43:11 1.12
@@ -319,7 +319,7 @@
noService04=No service object defined for this Call object.
#NOTE: in noService04, do not translate "AXIS", "targetService"
-noService04=The AXIS engine could not find a target service to invoke! targetService is {0}
+noService05=The AXIS engine could not find a target service to invoke! targetService is {0}
# NOTE: in noSecurity00, do not translate "MessageContext"
noSecurity00=No security provider in MessageContext!
@@ -393,6 +393,8 @@
outMsg00=Out message: {0}
params00=Parameters are: {0}
parent00=parent
+
+# NOTE: in parmMismatch00, do not translate "IN/INOUT", "addParameter()"
parmMismatch00=Number of parameters passed in ({0}) doesn''t match the number of IN/INOUT parameters ({1}) from the addParameter() calls
# NOTE: in parsing00, do not translate "XML"
@@ -442,7 +444,7 @@
serverRun00=Server is running
serverStop00=Server is stopped
-setCurrMsg00=Setting current message form to: {0} (currentMessage is now {1})
+setCurrMsg00=Setting current message form to: {0} (current message is now {1})
setProp00=Setting {0} property in {1}
# NOTE: in setupTunnel00, do not translate "SSL"
1.99 +1 -1 xml-axis/java/src/org/apache/axis/wsdl/Emitter.java
Index: Emitter.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/Emitter.java,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- Emitter.java 2001/11/09 19:57:45 1.98
+++ Emitter.java 2001/11/12 16:43:11 1.99
@@ -513,7 +513,7 @@
Map allInputs = inputMsg.getParts();
Collection orderedInputs = inputMsg.getOrderedParts(parameterOrder);
if (allInputs.size() != orderedInputs.size()) {
- throw new IOException(JavaUtils.getMessage("emitFail00"));
+ throw new IOException(JavaUtils.getMessage("emitFail00", operation.getName()));
}
}
}
1.2 +172 -3 xml-axis/java/test/utils/TestMessages.java
Index: TestMessages.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/utils/TestMessages.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestMessages.java 2001/11/05 18:39:54 1.1
+++ TestMessages.java 2001/11/12 16:43:12 1.2
@@ -1,7 +1,14 @@
package test.utils;
-import java.text.ParseException;
+import java.io.File;
+import java.io.FileInputStream;
+import java.text.MessageFormat;
+
+import java.util.Enumeration;
+import java.util.StringTokenizer;
+import java.util.Vector;
+
import junit.framework.AssertionFailedError;
import junit.framework.Test;
import junit.framework.TestCase;
@@ -17,8 +24,27 @@
public static Test suite() {
return new TestSuite(TestMessages.class);
}
+
+ public void testAllMessages() {
+ String arg0 = "arg0";
+ String arg1 = "arg1";
+ String[] args = {arg0, arg1, "arg2"};
+ Enumeration keys = JavaUtils.getMessageResourceBundle().getKeys();
+ while (keys.hasMoreElements()) {
+ String key = (String) keys.nextElement();
+ try {
+ String message = JavaUtils.getMessage(key);
+ message = JavaUtils.getMessage(key, arg0);
+ message = JavaUtils.getMessage(key, arg0, arg1);
+ message = JavaUtils.getMessage(key, args);
+ }
+ catch (IllegalArgumentException iae) {
+ throw new AssertionFailedError("Test failure on key = " + key + ": " + iae.getMessage());
+ }
+ }
+ } // testAllMessages
- public void testMessages() {
+ public void testTestMessages() {
try {
String message = JavaUtils.getMessage("test00");
String expected = "...";
@@ -63,6 +89,149 @@
}
catch (Throwable t) {
throw new AssertionFailedError("Test failure: " + t.getMessage());
+ }
+ } // testTestMessages
+
+ private String errors = "";
+
+ public void testForMissingMessages() {
+ String baseDir = System.getProperty("user.dir");
+ char sep = File.separatorChar;
+ String srcDirStr = baseDir + sep + "src";
+
+ File srcDir = new File(srcDirStr);
+ if (srcDir.exists()) {
+ walkTree(srcDir);
+ }
+ if (!errors.equals("")) {
+ throw new AssertionFailedError(errors);
+ }
+ } // testForMissingMessages
+
+ private void walkTree(File srcDir) {
+ File[] files = srcDir.listFiles();
+ for (int i = 0; i < files.length; ++i) {
+ if (files[i].isDirectory()) {
+ walkTree(files[i]);
+ }
+ else if (files[i].getName().endsWith(".java")) {
+ checkMessages(files[i]);
+ }
+ }
+ } // walkTree
+
+ private void checkMessages(File file) {
+ try {
+ FileInputStream fis = new FileInputStream(file);
+ byte[] bytes = new byte[fis.available()];
+ fis.read(bytes);
+ String string = new String(bytes);
+ int index = string.indexOf("JavaUtils.getMessage(");
+ while (index >= 0) {
+ string = string.substring(index + 21);
+ String[] msgArgs = args(string);
+ String key = msgArgs[0].substring(1, msgArgs[0].length() - 1);
+ String value = null;
+ try {
+ value = JavaUtils.getMessage(key);
+ }
+ catch (Throwable t) {
+ errors = errors + "File: " + file.getPath() + " " + t.getMessage() + '\n';
+ }
+ int realParms = count(value);
+ int expectedParms = msgArgs.length - 1;
+ if (realParms != expectedParms) {
+ errors = errors + "File: " + file.getPath() + " " + key + " has " + realParms + " parameters, " + expectedParms + " expected.\n";
+ }
+ index = string.indexOf("JavaUtils.getMessage(");
+ }
+ }
+ catch (Throwable t) {
+ errors = errors + "File: " + file.getPath() + " " + t.getMessage() + '\n';
+ }
+ } // checkMessages
+
+ private String[] args (String string) {
+ int innerParens = 0;
+ Vector args = new Vector();
+ String arg = "";
+ while (true) {
+ if (string.startsWith("\"")) {
+ String quote = readQuote(string);
+ arg = arg + quote;
+ string = string.substring(quote.length());
+ }
+ else if (string.startsWith("'")) {
+ arg = arg + string.substring(0, 2);
+ string = string.substring(2);
+ }
+ else if (string.startsWith(",")) {
+ if (innerParens == 0) {
+ args.add(arg);
+ arg = "";
+ }
+ else {
+ arg = arg + ',';
+ }
+ string = string.substring(1);
+ }
+ else if (string.startsWith("(")) {
+ ++innerParens;
+ arg = arg + '(';
+ string = string.substring(1);
+ }
+ else if (string.startsWith(")")) {
+ if (innerParens == 0) {
+ args.add(arg);
+ String[] argsArray = new String[args.size()];
+ args.toArray(argsArray);
+ return argsArray;
+ }
+ else {
+ --innerParens;
+ arg = arg + ')';
+ string = string.substring(1);
+ }
+ }
+ else {
+ if (!Character.isWhitespace(string.charAt(0))) {
+ arg = arg + string.charAt(0);
+ }
+ string = string.substring(1);
+ }
+ }
+ } // args
+
+ private String readQuote(String string) {
+ String quote = "\"";
+ string = string.substring(1);
+ while (true) {
+ int index = string.indexOf('"');
+ if (index == 0 || string.charAt(index - 1) != '\\') {
+ quote = quote + string.substring(0, index + 1);
+ return quote;
+ }
+ else {
+ quote = quote + string.substring(0, index + 1);
+ string = string.substring(index);
+ }
+ }
+ } // readQuote
+
+ private int count(String string) {
+ int parms = 0;
+ int index = string.indexOf("{");
+ while (index >= 0) {
+ try {
+ char parmNumber = string.charAt(index + 1);
+ if (parmNumber >= '0' && parmNumber <= '9' && string.charAt(index + 2) == '}') {
+ ++parms;
+ }
+ string = string.substring(index + 1);
+ index = string.indexOf("{");
+ } catch (Throwable t) {
+ }
}
- } // testMessages
+ return parms;
+ } // count
}