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/08 22:44:00 UTC
cvs commit: xml-axis/java/src/org/apache/axis/utils Admin.java JavaUtils.java NSStack.java Options.java resources.properties
butek 01/11/08 13:43:59
Modified: java/src/org/apache/axis/registries SupplierRegistry.java
java/src/org/apache/axis/resolver/sd ServiceDescriptor.java
java/src/org/apache/axis/security/servlet
ServletSecurityProvider.java
java/src/org/apache/axis/security/simple
SimpleSecurityProvider.java
java/src/org/apache/axis/server AxisServer.java
Transport.java
java/src/org/apache/axis/suppliers FactorySupplier.java
SimpleChainSupplier.java TargetedChainSupplier.java
java/src/org/apache/axis/transport/http AdminServlet.java
AxisServlet.java HTTPSender.java
NonBlockingBufferedInputStream.java
SimpleAxisServer.java
java/src/org/apache/axis/transport/local LocalResponder.java
LocalSender.java
java/src/org/apache/axis/utils Admin.java JavaUtils.java
NSStack.java Options.java resources.properties
Log:
Internationalized a few more packages:
org.apache.axis.registries
org.apache.axis.resolver
org.apache.axis.security
org.apache.axis.server
org.apache.axis.suppliers
org.apache.axis.transport
org.apache.axis.utils (except for tcpmon)
Revision Changes Path
1.18 +10 -9 xml-axis/java/src/org/apache/axis/registries/SupplierRegistry.java
Index: SupplierRegistry.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/registries/SupplierRegistry.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- SupplierRegistry.java 2001/10/31 23:50:21 1.17
+++ SupplierRegistry.java 2001/11/08 21:43:58 1.18
@@ -59,6 +59,7 @@
import org.apache.axis.Supplier;
import org.apache.axis.AxisFault;
import org.apache.axis.suppliers.SimpleSupplier;
+import org.apache.axis.utils.JavaUtils;
import org.apache.log4j.Category;
import java.util.Enumeration;
@@ -86,16 +87,16 @@
*/
public void add(String key, Handler handler) {
if (category.isDebugEnabled())
- category.debug("Registry " + this + " adding '" + key +
- "' (" + handler + ")");
+ category.debug(JavaUtils.getMessage("registryAdd00",
+ new String[] {"" + this, key, "" + handler}));
if ( suppliers == null ) suppliers = new Hashtable();
suppliers.put( key, new SimpleSupplier(handler) );
}
public void add(String key, Supplier supplier) {
if (category.isDebugEnabled())
- category.debug("Registry " + this + " adding '" + key +
- "' (" + supplier + ")");
+ category.debug(JavaUtils.getMessage("registryAdd00",
+ new String[] {"" + this, key, "" + supplier}));
if ( suppliers == null ) suppliers = new Hashtable();
suppliers.put( key, supplier );
}
@@ -117,21 +118,21 @@
*/
public Handler find(String key) {
if (category.isDebugEnabled())
- category.debug("Enter: SupplierRegistry::find(" + key + ")" );
+ category.debug(JavaUtils.getMessage("enter00", "SupplierRegistry::find(" + key + ")") );
if (key == null) {
if (category.isDebugEnabled())
- category.debug("Exit: SupplierRegistry::find - key is null" );
+ category.debug(JavaUtils.getMessage("exit02", "SupplierRegistry::find", "key") );
return( null );
}
if ( suppliers == null ) {
if (category.isDebugEnabled())
- category.debug("Exit: SupplierRegistry::find - suppliers is null" );
+ category.debug(JavaUtils.getMessage("exit02", "SupplierRegistry::find", "suppliers") );
return( null );
}
Supplier supplier = (Supplier)suppliers.get(key);
if (supplier == null) {
if (category.isDebugEnabled())
- category.debug( "Exit: SupplierRegistry::find - supplier is null" );
+ category.debug(JavaUtils.getMessage("exit02", "SupplierRegistry::find", "supplier") );
return null;
}
Handler h = null;
@@ -142,7 +143,7 @@
}
if (category.isDebugEnabled())
- category.debug( "Exit: SupplierRegistry::find" );
+ category.debug(JavaUtils.getMessage("exit00", "SupplierRegistry::find") );
return h ;
}
1.8 +29 -14 xml-axis/java/src/org/apache/axis/resolver/sd/ServiceDescriptor.java
Index: ServiceDescriptor.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/resolver/sd/ServiceDescriptor.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ServiceDescriptor.java 2001/10/30 14:19:31 1.7
+++ ServiceDescriptor.java 2001/11/08 21:43:58 1.8
@@ -64,6 +64,7 @@
import org.apache.axis.resolver.sd.schema.SDConstants;
import org.apache.axis.resolver.sd.schema.SDElement;
import org.apache.axis.resolver.sd.schema.Service;
+import org.apache.axis.utils.JavaUtils;
import org.apache.axis.utils.Mapping;
import org.apache.axis.utils.NSStack;
import org.xml.sax.SAXException;
@@ -195,7 +196,8 @@
if (SDConstants.SDNS.equals(uri)) {
if ("service".equals(ln)) {
if (current != null) {
- throw new SAXException("Unexpected service descriptor");
+ throw new SAXException(
+ JavaUtils.getMessage("unexpectedDesc00", "service"));
}
current = new Service();
stack.push(current);
@@ -203,9 +205,11 @@
}
if ("request".equals(ln)) {
if (current == null)
- throw new SAXException("Unexpected request descriptor");
+ throw new SAXException(
+ JavaUtils.getMessage("unexpectedDesc00", "request"));
if (!(current instanceof Service))
- throw new SAXException("Unexpected request descriptor");
+ throw new SAXException(
+ JavaUtils.getMessage("unexpectedDesc00", "request"));
Service service = (Service)current;
current = new HandlerList();
service.setRequest((HandlerList)current);
@@ -213,9 +217,11 @@
}
if ("response".equals(ln)) {
if (current == null)
- throw new SAXException("Unexpected response descriptor");
+ throw new SAXException(
+ JavaUtils.getMessage("unexpectedDesc00", "response"));
if (!(current instanceof Service))
- throw new SAXException("Unexpected response descriptor");
+ throw new SAXException(
+ JavaUtils.getMessage("unexpectedDesc00", "response"));
Service service = (Service)current;
current = new HandlerList();
service.setResponse((HandlerList)current);
@@ -223,9 +229,11 @@
}
if ("fault".equals(ln)) {
if (current == null)
- throw new SAXException("Unexpected fault descriptor");
+ throw new SAXException(
+ JavaUtils.getMessage("unexpectedDesc00", "fault"));
if (!(current instanceof Service))
- throw new SAXException("Unexpected fault descriptor");
+ throw new SAXException(
+ JavaUtils.getMessage("unexpectedDesc00", "fault"));
Service service = (Service)current;
Fault fault = new Fault();
String qname = attr.getValue("faultCode");
@@ -238,9 +246,11 @@
}
if ("handler".equals(ln)) {
if (current == null)
- throw new SAXException("Unexpected handler descriptor");
+ throw new SAXException(
+ JavaUtils.getMessage("unexpectedDesc00", "handler"));
if (!(current instanceof HandlerList))
- throw new SAXException("Unexpected handler descriptor");
+ throw new SAXException(
+ JavaUtils.getMessage("unexpectedDesc00", "handler"));
HandlerList handlerList = (HandlerList)current;
try {
String key = attr.getValue("key");
@@ -276,18 +286,22 @@
if (h != null) {
handlerList.addHandler(h);
} else {
- throw new SAXException("Cannot resolve chain");
+ throw new SAXException(
+ JavaUtils.getMessage("cantResolve00"));
}
}
} catch (Exception e) {
- throw new SAXException("Cannot resolve chain");
+ throw new SAXException(
+ JavaUtils.getMessage("cantResolve00"));
}
}
} else {
if (current == null)
- throw new SAXException("Unexpected unknown element");
+ throw new SAXException(
+ JavaUtils.getMessage("unexpectedUnknown00"));
if (!(current instanceof Service))
- throw new SAXException("Unexpected unknown element");
+ throw new SAXException(
+ JavaUtils.getMessage("unexpectedUnknown00"));
QName type = new QName(uri, ln);
Provider provider = Provider.newProvider(type);
provider.setResolver(resolver);
@@ -296,7 +310,8 @@
handler = provider.getDefaultHandler();
handler.startElement(uri, ln, rn, attr);
} else {
- throw new SAXException("Unexpected unknown element");
+ throw new SAXException(
+ JavaUtils.getMessage("unexpectedUnknown00"));
}
}
}
1.6 +4 -3 xml-axis/java/src/org/apache/axis/security/servlet/ServletSecurityProvider.java
Index: ServletSecurityProvider.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/security/servlet/ServletSecurityProvider.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ServletSecurityProvider.java 2001/10/30 16:46:39 1.5
+++ ServletSecurityProvider.java 2001/11/08 21:43:58 1.6
@@ -59,6 +59,7 @@
import org.apache.axis.security.AuthenticatedUser;
import org.apache.axis.security.SecurityProvider;
import org.apache.axis.transport.http.HTTPConstants;
+import org.apache.axis.utils.JavaUtils;
import org.apache.log4j.Category;
import javax.servlet.http.HttpServletRequest;
@@ -95,15 +96,15 @@
if (req == null)
return null;
- category.debug("Got HttpServletRequest");
+ category.debug(JavaUtils.getMessage("got00", "HttpServletRequest"));
Principal principal = req.getUserPrincipal();
if (principal == null) {
- category.debug("No principal!");
+ category.debug(JavaUtils.getMessage("noPrincipal00"));
return null;
}
- category.debug("Got principal : " + principal.getName());
+ category.debug(JavaUtils.getMessage("gotPrincipal00", principal.getName()));
return new ServletAuthenticatedUser(req);
}
1.9 +5 -5 xml-axis/java/src/org/apache/axis/security/simple/SimpleSecurityProvider.java
Index: SimpleSecurityProvider.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/security/simple/SimpleSecurityProvider.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- SimpleSecurityProvider.java 2001/10/30 16:46:39 1.8
+++ SimpleSecurityProvider.java 2001/11/08 21:43:59 1.9
@@ -59,6 +59,7 @@
import org.apache.axis.MessageContext;
import org.apache.axis.security.AuthenticatedUser;
import org.apache.axis.security.SecurityProvider;
+import org.apache.axis.utils.JavaUtils;
import org.apache.log4j.Category;
import java.io.File;
@@ -109,8 +110,7 @@
String userID = st.nextToken();
String passwd = (st.hasMoreTokens()) ? st.nextToken() : "";
- category.debug( "From file: '" + userID +
- "':'" + passwd + "'" );
+ category.debug( JavaUtils.getMessage("fromFile00", userID, passwd) );
users.put(userID, passwd);
}
}
@@ -141,7 +141,7 @@
String password = msgContext.getStrProp(MessageContext.PASSWORD);
if (users != null) {
- category.debug( "User: " + username );
+ category.debug( JavaUtils.getMessage("user00", username) );
// in order to authenticate, the user must exist
if ( username == null ||
@@ -150,13 +150,13 @@
return null;
String valid = (String) users.get(username);
- category.debug( "Pass: " + password );
+ category.debug( JavaUtils.getMessage("password00", password) );
// if a password is defined, then it must match
if ( valid.length()>0 && !valid.equals(password) )
return null;
- category.debug( "User '" + username + "' authenticated to server" );
+ category.debug( JavaUtils.getMessage("auth00", username) );
return new SimpleAuthenticatedUser(username);
}
1.45 +27 -29 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.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- AxisServer.java 2001/11/02 03:07:41 1.44
+++ AxisServer.java 2001/11/08 21:43:59 1.45
@@ -66,6 +66,7 @@
import org.apache.axis.client.AxisClient;
import org.apache.axis.configuration.FileProvider;
import org.apache.axis.utils.AxisClassLoader;
+import org.apache.axis.utils.JavaUtils;
import org.apache.log4j.Category;
/**
*
@@ -133,12 +134,12 @@
* handler for the desired service and invoke() it.
*/
public void invoke(MessageContext msgContext) throws AxisFault {
- category.debug("Enter: AxisServer::invoke" );
+ category.debug(JavaUtils.getMessage("enter00", "AxisServer::invoke") );
if (!isRunning()) {
throw new AxisFault("Server.disabled",
- "This Axis server is not currently accepting requests.",
- null, null);
+ JavaUtils.getMessage("serverDisabled00"),
+ null, null);
}
String hName = null ;
@@ -150,7 +151,7 @@
if ( (h = getHandler(hName)) == null ) {
AxisClassLoader cl = msgContext.getClassLoader();
try {
- category.debug( "Trying to load class: " + hName );
+ category.debug( JavaUtils.getMessage("tryingLoad00", hName) );
Class cls = cl.loadClass( hName );
h = (Handler) cls.newInstance();
}
@@ -162,7 +163,7 @@
h.invoke(msgContext);
else
throw new AxisFault( "Server.error",
- "Can't locate handler: " + hName,
+ JavaUtils.getMessage("noHandler00", hName),
null, null );
}
else {
@@ -181,7 +182,7 @@
/**************************************************************/
// When do we call init/cleanup??
- category.debug("Calling default logic in AxisServer" );
+ category.debug(JavaUtils.getMessage("defaultLogic00") );
/* This is what the entirety of this logic might evolve to:
@@ -206,9 +207,7 @@
SimpleTargetedChain transportChain = null;
if (category.isInfoEnabled())
- category.info("AxisServer.invoke: Transport = '" +
- hName +
- "'");
+ category.info(JavaUtils.getMessage("transport01", hName));
if ( hName != null && (h = getTransport( hName )) != null ) {
if (h instanceof SimpleTargetedChain) {
@@ -243,8 +242,8 @@
h = msgContext.getServiceHandler();
if (h == null)
throw new AxisFault("Server.NoService",
- "The Axis engine couldn't find a " +
- "target service to invoke! targetService is "+msgContext.getTargetService(),
+ JavaUtils.getMessage("noService04",
+ "" + msgContext.getTargetService()),
null, null );
}
@@ -270,19 +269,19 @@
// Should we even bother catching it ?
throw new AxisFault(e);
}
- category.debug("Exit: AxisServer::invoke" );
+ category.debug(JavaUtils.getMessage("exit00", "AxisServer::invoke") );
}
/**
*
*/
public void generateWSDL(MessageContext msgContext) throws AxisFault {
- category.debug("Enter: AxisServer::editWSDL" );
+ category.debug(JavaUtils.getMessage("enter00", "AxisServer::editWSDL") );
if (!isRunning()) {
throw new AxisFault("Server.disabled",
- "This Axis server is not currently accepting requests.",
- null, null);
+ JavaUtils.getMessage("serverDisabled00"),
+ null, null);
}
String hName = null ;
@@ -294,14 +293,15 @@
if ( (h = getHandler(hName)) == null ) {
AxisClassLoader cl = msgContext.getClassLoader();
try {
- category.debug( "Trying to load class: " + hName );
+ category.debug( JavaUtils.getMessage("tryingLoad00", hName) );
Class cls = cl.loadClass( hName );
h = (Handler) cls.newInstance();
}
catch( Exception e ) {
- throw new AxisFault( "Server.error",
- "Can't locate handler: " + hName,
- null, null );
+ throw new AxisFault(
+ "Server.error",
+ JavaUtils.getMessage("noHandler00", hName),
+ null, null );
}
}
h.generateWSDL(msgContext);
@@ -322,7 +322,7 @@
/**************************************************************/
// When do we call init/cleanup??
- category.debug( "Calling default logic in AxisServer" );
+ category.debug( JavaUtils.getMessage("defaultLogic00") );
/* This is what the entirety of this logic might evolve to:
@@ -347,9 +347,7 @@
SimpleTargetedChain transportChain = null;
if (category.isInfoEnabled())
- category.info("AxisServer.editWSDL: Transport = '" +
- hName +
- "'");
+ category.info(JavaUtils.getMessage("transport01", hName));
if ( hName != null && (h = getTransport( hName )) != null ) {
if (h instanceof SimpleTargetedChain) {
transportChain = (SimpleTargetedChain)h;
@@ -385,9 +383,9 @@
}
if (h == null)
throw new AxisFault("Server.NoService",
- "The Axis engine couldn't find a " +
- "target service to generate WSDL for! targetService is "+msgContext.getTargetService(),
- null, null );
+ JavaUtils.getMessage("noService04",
+ "" + msgContext.getTargetService()),
+ null, null );
}
h.generateWSDL(msgContext);
@@ -412,11 +410,11 @@
// Should we even bother catching it ?
throw new AxisFault( e );
}
- category.debug("Exit: AxisServer::editWSDL" );
+ category.debug(JavaUtils.getMessage("exit00", "AxisServer::editWSDL") );
}
public void undo(MessageContext msgContext) {
- category.debug("Enter: AxisServer::undo" );
- category.debug("Exit: AxisServer::undo" );
+ category.debug(JavaUtils.getMessage("enter00", "AxisServer::undo") );
+ category.debug(JavaUtils.getMessage("exit00", "AxisServer::undo") );
};
};
1.9 +3 -2 xml-axis/java/src/org/apache/axis/server/Transport.java
Index: Transport.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/server/Transport.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Transport.java 2001/10/30 16:46:39 1.8
+++ Transport.java 2001/11/08 21:43:59 1.9
@@ -55,6 +55,7 @@
package org.apache.axis.server;
import org.apache.axis.SimpleTargetedChain;
+import org.apache.axis.utils.JavaUtils;
import org.apache.log4j.Category;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -72,13 +73,13 @@
Category.getInstance(Transport.class.getName());
public Element getDeploymentData(Document doc) {
- category.debug("Enter: Transport::getDeploymentData");
+ category.debug(JavaUtils.getMessage("enter00", "Transport::getDeploymentData"));
Element root = doc.createElementNS("", "transport");
fillInDeploymentData(root);
- category.debug("Exit: Transport::getDeploymentData");
+ category.debug(JavaUtils.getMessage("exit00", "Transport::getDeploymentData"));
return( root );
}
}
1.10 +2 -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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- FactorySupplier.java 2001/10/30 16:46:40 1.9
+++ FactorySupplier.java 2001/11/08 21:43:59 1.10
@@ -57,6 +57,7 @@
import org.apache.axis.Handler;
import org.apache.axis.Supplier;
+import org.apache.axis.utils.JavaUtils;
import org.apache.log4j.Category;
import java.util.Hashtable;
@@ -84,7 +85,7 @@
Handler handler = (Handler)_class.newInstance();
handler.setOptions(_options);
if (category.isDebugEnabled())
- category.debug("FactorySupplier returning new instance of " + _class.getName());
+ category.debug(JavaUtils.getMessage("return00", _class.getName()));
return handler;
} catch (IllegalAccessException e1) {
e1.printStackTrace();
1.10 +3 -5 xml-axis/java/src/org/apache/axis/suppliers/SimpleChainSupplier.java
Index: SimpleChainSupplier.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/suppliers/SimpleChainSupplier.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- SimpleChainSupplier.java 2001/10/31 23:50:21 1.9
+++ SimpleChainSupplier.java 2001/11/08 21:43:59 1.10
@@ -60,6 +60,7 @@
import org.apache.axis.SimpleChain;
import org.apache.axis.Supplier;
import org.apache.axis.AxisEngine;
+import org.apache.axis.utils.JavaUtils;
import org.apache.log4j.Category;
import java.util.Hashtable;
@@ -95,9 +96,7 @@
{
if (_chain == null) {
if (category.isDebugEnabled())
- category.debug( "SimpleChainSupplier: Building chain '" +
- _myName +
- "'");
+ category.debug( JavaUtils.getMessage("buildChain00", "SimpleChainSupplier:", _myName));
Chain c = new SimpleChain();
c.setOptions(_options);
c.setName(_myName);
@@ -116,8 +115,7 @@
}
if (category.isDebugEnabled())
- category.debug("SimpleChainSupplier: returning chain '" + _myName +
- "'");
+ category.debug(JavaUtils.getMessage("returnChain00", "SimpleChainSupplier:", _myName));
return _chain;
}
1.14 +3 -4 xml-axis/java/src/org/apache/axis/suppliers/TargetedChainSupplier.java
Index: TargetedChainSupplier.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/suppliers/TargetedChainSupplier.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- TargetedChainSupplier.java 2001/10/31 23:50:21 1.13
+++ TargetedChainSupplier.java 2001/11/08 21:43:59 1.14
@@ -63,6 +63,7 @@
import org.apache.axis.AxisEngine;
import org.apache.axis.AxisFault;
import org.apache.axis.registries.HandlerRegistry;
+import org.apache.axis.utils.JavaUtils;
import org.apache.log4j.Category;
import java.util.Enumeration;
@@ -125,8 +126,7 @@
{
if (_chain == null) {
if (category.isDebugEnabled())
- category.debug("TargetedChainSupplier: Building chain '" + _myName +
- "'");
+ category.debug(JavaUtils.getMessage("buildChain00", "TargetedChainSupplier:", _myName));
Handler h;
SimpleTargetedChain c = getNewChain();
@@ -162,8 +162,7 @@
}
if (category.isDebugEnabled())
- category.debug( "TargetedChainSupplier: Returning chain '" + _myName +
- "'");
+ category.debug( JavaUtils.getMessage("returnChain00", "TargetedChainSupplier:", _myName));
return _chain;
}
}
1.11 +7 -1 xml-axis/java/src/org/apache/axis/transport/http/AdminServlet.java
Index: AdminServlet.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/transport/http/AdminServlet.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- AdminServlet.java 2001/10/31 23:50:21 1.10
+++ AdminServlet.java 2001/11/08 21:43:59 1.11
@@ -57,6 +57,7 @@
import org.apache.axis.configuration.FileProvider;
import org.apache.axis.server.AxisServer;
+import org.apache.axis.utils.JavaUtils;
import org.apache.axis.Constants;
import javax.servlet.ServletException;
@@ -102,7 +103,12 @@
server.stop();
}
- str += "Server is " + (server.isRunning() ? "running" : "stopped");
+ if (server.isRunning()) {
+ str += JavaUtils.getMessage("serverRun00");
+ }
+ else {
+ str += JavaUtils.getMessage("serverStop00");
+ }
str += "<p><a href=\"AdminServlet?cmd=start\">start server</a>";
str += "<p><a href=\"AdminServlet?cmd=stop\">stop server</a>";
res.getWriter().println( str );
1.61 +39 -24 xml-axis/java/src/org/apache/axis/transport/http/AxisServlet.java
Index: AxisServlet.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/transport/http/AxisServlet.java,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- AxisServlet.java 2001/11/07 19:21:46 1.60
+++ AxisServlet.java 2001/11/08 21:43:59 1.61
@@ -66,6 +66,7 @@
import org.apache.axis.security.servlet.ServletSecurityProvider;
import org.apache.axis.server.AxisServer;
import org.apache.axis.utils.Admin;
+import org.apache.axis.utils.JavaUtils;
import org.apache.axis.utils.XMLUtils;
import org.w3c.dom.Document;
@@ -192,8 +193,10 @@
XMLUtils.DocumentToWriter(doc, writer);
} else {
res.setContentType("text/html");
- writer.println("<h2>Axis Error</h2>");
- writer.println("<p>Couldn't generate WSDL!</p>");
+ writer.println("<h2>" +
+ JavaUtils.getMessage("error00") + "</h2>");
+ writer.println("<p>" +
+ JavaUtils.getMessage("noWSDL00") + "</p>");
}
} else if (listRequested) {
if (enableList) {
@@ -203,13 +206,17 @@
XMLUtils.DocumentToWriter(doc, writer);
} else {
res.setContentType("text/html");
- writer.println("<h2>Axis Error</h2>");
- writer.println("<p>Couldn't generate deployment list!</p>");
+ writer.println("<h2>" +
+ JavaUtils.getMessage("error00") + "</h2>");
+ writer.println("<p>" +
+ JavaUtils.getMessage("noDeploy00") + "</p>");
}
} else {
res.setContentType("text/html");
- writer.println("<h2>Axis Error</h2>");
- writer.println("<p><i>?list</i> functionality disabled.</p>");
+ writer.println("<h2>" +
+ JavaUtils.getMessage("error00") + "</h2>");
+ writer.println("<p><i>?list</i>" +
+ JavaUtils.getMessage("disabled00") + "</p>");
}
} else if (req.getParameterNames().hasMoreElements()) {
res.setContentType("text/html");
@@ -227,8 +234,11 @@
}
}
if (method == null) {
- writer.println("<h2>Axis Error : invoking via GET</h2>");
- writer.println("<p>No method!</p>");
+ writer.println("<h2>" + JavaUtils.getMessage("error00") +
+ ": " +
+ JavaUtils.getMessage("invokeGet00") + "</h2>");
+ writer.println("<p>" +
+ JavaUtils.getMessage("noMethod01") + "</p>");
return;
}
String body = "<" + method + ">" + args +
@@ -247,10 +257,12 @@
engine.invoke(msgContext);
Message respMsg = msgContext.getResponseMessage();
if (respMsg != null) {
- writer.println("<p>Got response message:</p>");
+ writer.println("<p>" +
+ JavaUtils.getMessage("gotResponse00") + "</p>");
writer.println(respMsg.getSOAPPart().getAsString());
} else {
- writer.println("<p>No response message!</p>");
+ writer.println("<p>" +
+ JavaUtils.getMessage("noResponse01") + "</p>");
}
} else {
res.setContentType("text/html");
@@ -258,19 +270,24 @@
"</h1>");
writer.println(configPath);
writer.println(
- "<p>Hi there, this is an Axis service!</p>");
+ "<p>" +
+ JavaUtils.getMessage("axisService00") + "</p>");
writer.println(
- "<i>Perhaps there'll be a form for invoking the service here...</i>");
+ "<i>" + JavaUtils.getMessage("perhaps00") + "</i>");
}
} catch (AxisFault fault) {
res.setContentType("text/html");
- writer.println("<h2>Axis Error</h2>");
- writer.println("<p>Sorry, something seems to have gone wrong... here are the details:</p>");
+ writer.println("<h2>" +
+ JavaUtils.getMessage("error00") + "</h2>");
+ writer.println("<p>" +
+ JavaUtils.getMessage("somethingWrong00") + "</p>");
writer.println("<pre>Fault - " + fault + " </pre>");
} catch (Exception e) {
res.setContentType("text/html");
- writer.println("<h2>Axis Error</h2>");
- writer.println("<p>Sorry, something seems to have gone wrong... here are the details:</p>");
+ writer.println("<h2>" +
+ JavaUtils.getMessage("error00") + "</h2>");
+ writer.println("<p>" +
+ JavaUtils.getMessage("somethingWrong00") + "</p>");
writer.println("<pre>Exception - " + e + "<br>");
e.printStackTrace(res.getWriter());
writer.println("</pre>");
@@ -282,12 +299,10 @@
res.setContentType("text/html");
writer.println( "<html><h1>Axis HTTP Servlet</h1>" );
- writer.println( "Hi, you've reached the Axis HTTP servlet." +
- "Normally you would be hitting this URL with a SOAP client " +
- "rather than a browser.");
+ writer.println( JavaUtils.getMessage("reachedServlet00"));
- writer.println("<p>In case you're interested, my Axis " +
- "transport name appears to be '<b>" + transportName + "</b>'");
+ writer.println("<p>" + JavaUtils.getMessage("transportName00",
+ "<b>" + transportName + "</b>"));
writer.println("</html>");
}
@@ -306,7 +321,7 @@
if (engine == null) {
// !!! should return a SOAP fault...
- throw new ServletException("Couldn't find AxisEngine!");
+ throw new ServletException(JavaUtils.getMessage("noEngine00"));
}
/* Place the Request message in the MessagContext object - notice */
@@ -361,7 +376,7 @@
*/
if ( tmp == null ) {
throw new AxisFault( "Client.NoSOAPAction",
- "No SOAPAction header!",
+ JavaUtils.getMessage("noHeader00", "SOAPAction"),
null, null );
}
@@ -420,7 +435,7 @@
/***********************************/
if(null== (msg = msgContext.getResponseMessage())) {
- String resp= "No data";
+ String resp= JavaUtils.getMessage("noData00");
res.setContentLength( resp.getBytes().length );
res.getWriter().print(resp);
}else{
1.32 +24 -19 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.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- HTTPSender.java 2001/11/07 19:21:46 1.31
+++ HTTPSender.java 2001/11/08 21:43:59 1.32
@@ -61,6 +61,7 @@
import org.apache.axis.encoding.Base64;
import org.apache.axis.handlers.BasicHandler;
import org.apache.axis.message.MessageElement;
+import org.apache.axis.utils.JavaUtils;
import org.apache.log4j.Category;
import java.io.BufferedInputStream;
@@ -87,7 +88,7 @@
Category.getInstance(HTTPSender.class.getName());
public void invoke(MessageContext msgContext) throws AxisFault {
- category.debug( "Enter: HTTPSender::invoke" );
+ category.debug( JavaUtils.getMessage("enter00", "HTTPSender::invoke") );
/* Find the service we're invoking so we can grab it's options */
/***************************************************************/
String targetURL = null ;
@@ -159,28 +160,30 @@
InputStream tunnelInputStream = (InputStream)SSLSocketClass.getMethod("getInputStream", new Class[] {}).invoke(tunnel, new Object[] {});
//BufferedReader in = new BufferedReader(new InputStreamReader(tunnelInputStream));
//DataInputStream in = new DataInputStream(tunnelInputStream);
- category.debug("Is tunnelInputStream null? " + String.valueOf(tunnelInputStream == null));
+ category.debug(JavaUtils.getMessage("isNull00", "tunnelInputStream", "" + (tunnelInputStream == null)));
String replyStr = ""; int i;
while ((i = tunnelInputStream.read()) != '\n' && i != '\r' && i != -1) { replyStr += String.valueOf((char)i); }
if (!replyStr.startsWith("HTTP/1.0 200") && !replyStr.startsWith("HTTP/1.1 200")) {
- throw new IOException("Unable to tunnel through " + tunnelHost + ":" + tunnelPort + ". Proxy returns \"" + replyStr + "\"");
+ throw new IOException(JavaUtils.getMessage("cantTunnel00",
+ new String[] {tunnelHost, "" + tunnelPort, replyStr}));
}
// End of condensed reflective tunnel handshake method
sslSocket = createSocketMethod2.invoke(factory,
new Object[] {tunnel, host, new Integer(port), new Boolean(true)});
- category.debug( "Set up SSL tunnelling through " + tunnelHost + ":" +tunnelPort);
+ category.debug(JavaUtils.getMessage(
+ "setupTunnel00", tunnelHost, "" + tunnelPort));
}
// must shake out hidden errors!
startHandshakeMethod.invoke(sslSocket, new Object[] {});
sock = (Socket)sslSocket;
} catch (ClassNotFoundException cnfe) {
- category.debug( "SSL feature disallowed: JSSE files not installed or present in classpath");
+ category.debug( JavaUtils.getMessage("noJSSE00"));
throw new AxisFault(cnfe);
} catch (NumberFormatException nfe) {
- category.debug( "Proxy port number, \"" + tunnelPortStr + "\", incorrectly formatted");
+ category.debug( JavaUtils.getMessage("badProxy00", tunnelPortStr));
throw new AxisFault(nfe);
}
- category.debug( "Created an SSL connection");
+ category.debug( JavaUtils.getMessage("createdSSL00"));
} else {
String proxyHost = System.getProperty("http.proxyHost");
String proxyPort = System.getProperty("http.proxyPort");
@@ -193,10 +196,10 @@
|| proxyPort == null || proxyPort.equals("")
|| hostInNonProxyList) {
sock = new Socket( host, port );
- category.debug( "Created an insecure HTTP connection");
+ category.debug( JavaUtils.getMessage("createdHTTP00"));
} else {
sock = new Socket( proxyHost, new Integer(proxyPort).intValue() );
- category.debug( "Created an insecure HTTP connection using proxy "+proxyHost+" port "+proxyPort);
+ category.debug( JavaUtils.getMessage("createdHTTP01", proxyHost, proxyPort));
useFullURL = true;
}
}
@@ -288,7 +291,7 @@
reqMessage.writeContentToStream(out);
out.flush();
- category.debug( "XML sent:" );
+ category.debug( JavaUtils.getMessage("xmlSent00") );
category.debug( "---------------------------------------------------");
category.debug( header + reqEnv );
@@ -359,8 +362,8 @@
statusMessage,
null,
null);
- fault.setFaultDetailsString("return code:" + returnCode + "\n"+
- new String(buf, 0, len));
+ fault.setFaultDetailsString(JavaUtils.getMessage("return01",
+ "" + returnCode, new String(buf, 0, len)));
throw fault;
}
@@ -376,14 +379,14 @@
outMsg = new Message( data );
- category.debug( "\nXML received:" );
+ category.debug( "\n" + JavaUtils.getMessage("xmlrecd00") );
category.debug( "-----------------------------------------------");
category.debug( xml );
}
else {
outMsg = new Message( inp );
- category.debug( "\nNo Content-Length" );
- category.debug( "\nXML received:" );
+ category.debug( "\n" + JavaUtils.getMessage("no00", "Content-Length") );
+ category.debug( "\n" + JavaUtils.getMessage("xmlrecd00") );
category.debug( "-----------------------------------------------");
category.debug( (String) outMsg.getSOAPPart().getAsString() );
}
@@ -414,7 +417,7 @@
if ( !(e instanceof AxisFault) ) e = new AxisFault(e);
throw (AxisFault) e ;
}
- category.debug( "Exit: HTTPDispatchHandler::invoke" );
+ category.debug( JavaUtils.getMessage("exit00", "HTTPDispatchHandler::invoke") );
}
// little helper function for cookies
@@ -441,7 +444,9 @@
StringTokenizer tokenizer = new StringTokenizer(nonProxyHosts,"|");
while(tokenizer.hasMoreTokens()) {
String pattern = tokenizer.nextToken();
- category.debug( "HTTPSender match Host: " + host + " Pattern:" + pattern);
+ category.debug( JavaUtils.getMessage(
+ "match00",
+ new String[] {"HTTPSender", host, pattern}));
if(match(pattern, host, false))
return true;
}
@@ -602,8 +607,8 @@
public void undo(MessageContext msgContext) {
- category.debug( "Enter: HTTPDispatchHandler::undo" );
- category.debug( "Exit: HTTPDispatchHandler::undo" );
+ category.debug( JavaUtils.getMessage("enter00", "HTTPDispatchHandler::undo") );
+ category.debug( JavaUtils.getMessage("exit00", "HTTPDispatchHandler::undo") );
}
};
1.6 +55 -0 xml-axis/java/src/org/apache/axis/transport/http/NonBlockingBufferedInputStream.java
Index: NonBlockingBufferedInputStream.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/transport/http/NonBlockingBufferedInputStream.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- NonBlockingBufferedInputStream.java 2001/10/26 16:09:37 1.5
+++ NonBlockingBufferedInputStream.java 2001/11/08 21:43:59 1.6
@@ -1,3 +1,58 @@
+/*
+ * The Apache Software License, Version 1.1
+ *
+ *
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The end-user documentation included with the redistribution,
+ * if any, must include the following acknowledgment:
+ * "This product includes software developed by the
+ * Apache Software Foundation (http://www.apache.org/)."
+ * Alternately, this acknowledgment may appear in the software itself,
+ * if and wherever such third-party acknowledgments normally appear.
+ *
+ * 4. The names "Axis" and "Apache Software Foundation" must
+ * not be used to endorse or promote products derived from this
+ * software without prior written permission. For written
+ * permission, please contact apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache",
+ * nor may "Apache" appear in their name, without prior written
+ * permission of the Apache Software Foundation.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation. For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ */
+
package org.apache.axis.transport.http;
import java.io.IOException;
1.38 +18 -16 xml-axis/java/src/org/apache/axis/transport/http/SimpleAxisServer.java
Index: SimpleAxisServer.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/transport/http/SimpleAxisServer.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- SimpleAxisServer.java 2001/11/02 03:07:41 1.37
+++ SimpleAxisServer.java 2001/11/08 21:43:59 1.38
@@ -67,6 +67,7 @@
import org.apache.axis.session.Session;
import org.apache.axis.session.SimpleSession;
import org.apache.axis.utils.Options;
+import org.apache.axis.utils.JavaUtils;
import org.apache.axis.utils.XMLUtils;
import org.apache.log4j.Category;
import org.w3c.dom.Document;
@@ -133,9 +134,9 @@
private static byte HTTP[] = "HTTP/1.0 ".getBytes();
// HTTP status codes
- private static byte OK[] = "200 OK".getBytes();
- private static byte UNAUTH[] = "401 Unauthorized".getBytes();
- private static byte ISE[] = "500 Internal Server Error".getBytes();
+ private static byte OK[] = ("200 " + JavaUtils.getMessage("ok00")).getBytes();
+ private static byte UNAUTH[] = ("401 " + JavaUtils.getMessage("unauth00")).getBytes();
+ private static byte ISE[] = ("500 " + JavaUtils.getMessage("internalError01")).getBytes();
// Standard MIME headers for XML payload
private static byte XML_MIME_STUFF[] =
@@ -154,7 +155,7 @@
private static final String responseStr =
"<html><head><title>SimpleAxisServer</title></head>" +
"<body><h1>SimpleAxisServer</h1>" +
- "You've reached the SimpleAxisServer." +
+ JavaUtils.getMessage("reachedServer00") +
"</html>";
private static byte cannedHTMLResponse[] = responseStr.getBytes();
@@ -172,7 +173,7 @@
* Axis engine for processing.
*/
public void run() {
- category.debug("SimpleAxisServer starting up.");
+ category.debug(JavaUtils.getMessage("start00", "SimpleAxisServer"));
// create an Axis server
AxisServer engine = getAxisServer();
@@ -247,8 +248,8 @@
// Got params
String params = fileName.substring(paramIdx + 1);
fileName.setLength(paramIdx);
- category.debug("Filename is " + fileName.toString());
- category.debug("Params is " + params);
+ category.debug(JavaUtils.getMessage("filename00", "" + fileName.toString()));
+ category.debug(JavaUtils.getMessage("params00", params));
if ("wsdl".equalsIgnoreCase(params))
doWsdl = true;
}
@@ -281,8 +282,8 @@
}
authBuf.append((char)(decoded[i] & 0x7f));
}
- category.info("Username : " + userBuf.toString());
- category.info("Password : " + pwBuf.toString());
+ category.info(JavaUtils.getMessage("user00", userBuf.toString()));
+ category.info(JavaUtils.getMessage("password00", pwBuf.toString()));
msgContext.setProperty(MessageContext.USERID,
userBuf.toString());
msgContext.setProperty(MessageContext.PASSWORD,
@@ -369,7 +370,7 @@
AxisFault af;
if (e instanceof AxisFault) {
af = (AxisFault)e;
- category.error("HTTP server fault", af);
+ category.error(JavaUtils.getMessage("serverFault00"), af);
if ("Server.Unauthorized".equals(af.getFaultCode())) {
status = UNAUTH; // SC_UNAUTHORIZED
@@ -443,7 +444,7 @@
}
}
}
- System.out.println("SimpleAxisServer quitting.");
+ System.out.println(JavaUtils.getMessage("quit00", "SimpleAxisServer"));
}
// ASCII character mapping to lower case
@@ -541,7 +542,7 @@
n=this.readLine(is, buf, 0, buf.length);
if (n < 0) {
// nothing!
- throw new IOException("Unexpected end of stream");
+ throw new IOException(JavaUtils.getMessage("unexpectedEOS00"));
}
// which does it begin with?
@@ -556,7 +557,7 @@
break;
fileName.append(c);
}
- category.debug( "SimpleAxisServer: req filename='" + fileName.toString() + "'");
+ category.debug( JavaUtils.getMessage("filename01", "SimpleAxisServer", fileName.toString()));
return 0;
} else if (buf[0] == postHeader[0]) {
httpRequest.append("POST");
@@ -566,9 +567,9 @@
break;
fileName.append(c);
}
- category.debug( "SimpleAxisServer: req filename='" + fileName.toString() + "'");
+ category.debug( JavaUtils.getMessage("filename01", "SimpleAxisServer", fileName.toString()));
} else {
- throw new IOException("Cannot handle non-GET, non-POST request");
+ throw new IOException(JavaUtils.getMessage("badRequest00"));
}
while ((n=readLine(is,buf,0,buf.length)) > 0) {
@@ -642,7 +643,8 @@
authInfo.append((char)(buf[i] & 0x7f));
}
} else {
- throw new IOException("Bad authentication type (I can only handle Basic).");
+ throw new IOException(
+ JavaUtils.getMessage("badAuth00"));
}
}
1.9 +5 -4 xml-axis/java/src/org/apache/axis/transport/local/LocalResponder.java
Index: LocalResponder.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/transport/local/LocalResponder.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- LocalResponder.java 2001/11/02 03:07:42 1.8
+++ LocalResponder.java 2001/11/08 21:43:59 1.9
@@ -58,6 +58,7 @@
import org.apache.axis.AxisFault;
import org.apache.axis.MessageContext;
import org.apache.axis.handlers.BasicHandler;
+import org.apache.axis.utils.JavaUtils;
import org.apache.log4j.Category;
/**
@@ -71,13 +72,13 @@
Category.getInstance(LocalResponder.class.getName());
public void invoke(MessageContext msgContext) throws AxisFault {
- category.debug("Enter: LocalResponder::invoke" );
+ category.debug(JavaUtils.getMessage("enter00", "LocalResponder::invoke") );
msgContext.getResponseMessage().getSOAPPart().getAsString();
- category.debug("Enter: LocalResponder::invoke" );
+ category.debug(JavaUtils.getMessage("exit00", "LocalResponder::invoke") );
}
public void undo(MessageContext msgContext) {
- category.debug("Enter: LocalResponder::undo" );
- category.debug("Exit: LocalResponder::undo" );
+ category.debug(JavaUtils.getMessage("enter00", "LocalResponder::undo") );
+ category.debug(JavaUtils.getMessage("exit00", "LocalResponder::undo") );
}
};
1.18 +7 -6 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.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- LocalSender.java 2001/11/02 03:07:42 1.17
+++ LocalSender.java 2001/11/08 21:43:59 1.18
@@ -64,6 +64,7 @@
import org.apache.axis.message.SOAPEnvelope;
import org.apache.axis.message.SOAPFaultElement;
import org.apache.axis.server.AxisServer;
+import org.apache.axis.utils.JavaUtils;
import org.apache.log4j.Category;
import java.net.URL;
@@ -88,11 +89,11 @@
}
public void invoke(MessageContext clientContext) throws AxisFault {
- category.debug("Enter: LocalSender::invoke" );
+ category.debug(JavaUtils.getMessage("enter00", "LocalSender::invoke") );
AxisServer targetServer = (AxisServer)clientContext.
getProperty(LocalTransport.LOCAL_SERVER);
- category.debug( "LocalSender using server " + targetServer);
+ category.debug( JavaUtils.getMessage("usingServer00", "LocalSender", "" + targetServer));
if (targetServer == null) {
// This should have already been done, but it doesn't appear to be
@@ -108,7 +109,7 @@
// exercise the serializers.
String msgStr = clientContext.getRequestMessage().getSOAPPart().getAsString();
- category.debug( "LocalSender sending XML:");
+ category.debug( JavaUtils.getMessage("sendingXML00"));
category.debug( msgStr);
serverContext.setRequestMessage(new Message(msgStr));
@@ -158,11 +159,11 @@
clientContext.setResponseMessage(serverContext.getResponseMessage());
//clientContext.getResponseMessage().getAsString();
- category.debug("Exit: LocalSender::invoke" );
+ category.debug(JavaUtils.getMessage("exit00", "LocalSender::invoke") );
}
public void undo(MessageContext msgContext) {
- category.debug("Enter: LocalSender::undo" );
- category.debug("Exit: LocalSender::undo" );
+ category.debug(JavaUtils.getMessage("enter00", "LocalSender::undo") );
+ category.debug(JavaUtils.getMessage("exit00", "LocalSender::undo") );
}
};
1.80 +37 -36 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.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- Admin.java 2001/11/07 21:04:21 1.79
+++ Admin.java 2001/11/08 21:43:59 1.80
@@ -179,9 +179,9 @@
public Document AdminService(MessageContext msgContext, Document xml)
throws AxisFault
{
- category.debug("Enter: Admin:AdminService" );
+ category.debug(JavaUtils.getMessage("enter00", "Admin:AdminService") );
Document doc = process( msgContext, xml.getDocumentElement() );
- category.debug("Exit: Admin:AdminService" );
+ category.debug(JavaUtils.getMessage("exit00", "Admin:AdminService") );
return( doc );
}
@@ -206,8 +206,8 @@
}
if (!el.getTagName().equals("engineConfig"))
- throw new Exception("Wanted 'engineConfig' element, got '" +
- el.getTagName() + "'");
+ throw new Exception(
+ JavaUtils.getMessage("noEngineConfig00", el.getTagName()));
NodeList nl = el.getElementsByTagName("handlers");
deploy(nl, engine);
@@ -294,7 +294,10 @@
// ignore it
break;
default:
- throw new UnknownError("Shouldn't happen: " + type);
+ throw new UnknownError(JavaUtils.getMessage(
+ "never00",
+ "org.apache.axis.utils.Admin",
+ "type = " + type));
}
}
}
@@ -316,7 +319,7 @@
doc = XMLUtils.newDocument();
doc.appendChild( root = doc.createElementNS("", "Admin" ) );
- root.appendChild( doc.createTextNode( "Done processing" ) );
+ root.appendChild( doc.createTextNode( JavaUtils.getMessage("done00") ) );
return doc;
}
@@ -363,11 +366,11 @@
if (!myAddr.equals(remoteAddr))
throw new AxisFault("Server.Unauthorized",
- "Remote admin access is not allowed! ",
+ JavaUtils.getMessage("noAdminAccess00"),
null, null);
} catch (UnknownHostException e) {
throw new AxisFault("Server.UnknownHost",
- "Unknown host - couldn't verify admin access",
+ JavaUtils.getMessage("unknownHost00"),
null, null);
}
}
@@ -401,8 +404,7 @@
!action.equals("quit") &&
!action.equals("passwd"))
throw new AxisFault( "Admin.error",
- "Root element must be 'clientdeploy', 'deploy', 'undeploy', " +
- "'list', 'passwd', or 'quit'",
+ JavaUtils.getMessage("badRootElem00"),
null, null );
@@ -411,12 +413,12 @@
engine.setAdminPassword(newPassword);
doc = XMLUtils.newDocument();
doc.appendChild( root = doc.createElementNS("", "Admin" ) );
- root.appendChild( doc.createTextNode( "Done processing" ) );
+ root.appendChild( doc.createTextNode( JavaUtils.getMessage("done00") ) );
return doc;
}
if (action.equals("quit")) {
- System.err.println("Admin service requested to quit, quitting.");
+ System.err.println(JavaUtils.getMessage("quitRequest00"));
if (msgContext != null) {
// put a flag into message context so listener will exit after
// sending response
@@ -424,7 +426,7 @@
}
doc = XMLUtils.newDocument();
doc.appendChild( root = doc.createElementNS("", "Admin" ) );
- root.appendChild( doc.createTextNode( "Quitting" ) );
+ root.appendChild( doc.createTextNode( JavaUtils.getMessage("quit00", "") ) );
return doc;
}
@@ -452,16 +454,16 @@
if ( action.equals( "undeploy" ) ) {
if ( type.equals("service") ) {
- category.info( "Undeploying " + type + ": " + name );
+ category.info( JavaUtils.getMessage("undeploy00", type + ": " + name) );
engine.undeployService( name );
}
else if ( type.equals("handler") || type.equals("chain") ) {
- category.info( "Undeploying " + type + ": " + name );
+ category.info( JavaUtils.getMessage("undeploy00", type + ": " + name) );
engine.undeployHandler( name );
}
else
throw new AxisFault( "Admin.error",
- "Unknown type; " + type,
+ JavaUtils.getMessage("unknownType00", type),
null, null );
continue ;
}
@@ -488,7 +490,7 @@
registerTypes(elem, dep, false, engine.getDeploymentRegistry());
} else
throw new AxisFault( "Admin.error",
- "Unknown type to " + action + ": " + type,
+ JavaUtils.getMessage("unknownType01", action + ": " + type),
null, null );
}
@@ -496,7 +498,7 @@
doc = XMLUtils.newDocument();
doc.appendChild( root = doc.createElementNS("", "Admin" ) );
- root.appendChild( doc.createTextNode( "Done processing" ) );
+ root.appendChild( doc.createTextNode( JavaUtils.getMessage("done00") ) );
}
catch( Exception e ) {
e.printStackTrace();
@@ -559,7 +561,7 @@
for( i = 0 ; names != null && i < names.length ; i++ ) {
h = registry.find(names[i]);
if (h == null)
- throw new AxisFault("Server", "Couldn't find registered handler '" + names[i] + "'", null, null);
+ throw new AxisFault("Server", JavaUtils.getMessage("noHandler02", names[i]), null, null);
elem = h.getDeploymentData(doc);
if ( elem == null ) continue ;
@@ -597,7 +599,7 @@
if ("".equals(name)) name = null;
if (flow != null) {
- category.info( "Deploying chain: " + name );
+ category.info( JavaUtils.getMessage("deployChain00", name) );
Vector names = new Vector();
getOptions( elem, options );
@@ -641,14 +643,14 @@
if ( pivot != null && pivot.equals("") ) pivot = null ;
if ( name != null && name.equals("") ) name = null ;
- category.info( "Deploying service: " + name );
+ category.info( JavaUtils.getMessage("deployService00", name) );
String hName = null ;
Handler tmpH = null ;
StringTokenizer st = null ;
if ( pivot == null && request == null && response == null )
throw new AxisFault( "Admin.error",
- "Services must use targeted chains",
+ JavaUtils.getMessage("noChains00"),
null, null );
WSDDService serv = new WSDDService();
@@ -673,7 +675,7 @@
Handler pivotHandler = engine.getHandler(pivot);
if (pivotHandler == null)
- throw new AxisFault("No pivot handler '" + pivot + "' found!");
+ throw new AxisFault(JavaUtils.getMessage("noPivot00", pivot));
Class pivotClass = pivotHandler.getClass();
if (pivotClass == RPCProvider.class) {
serv.setProviderQName(WSDDConstants.JAVARPC_PROVIDER);
@@ -724,7 +726,7 @@
String cls = elem.getAttribute( "class" );
if ( cls != null && cls.equals("") ) cls = null ;
- category.info( "Deploying handler: " + name );
+ category.info( JavaUtils.getMessage("deployHandler00", name) );
h = engine.getHandler( name );
if ( h == null ) h = (Handler) cl.loadClass(cls).newInstance();
@@ -759,7 +761,7 @@
if ( sender != null && sender.equals("") ) sender = null ;
if ( name != null && name.equals("") ) name = null ;
- category.info( "Deploying Transport: " + name );
+ category.info( JavaUtils.getMessage("deployTransport00", name) );
StringTokenizer st = null ;
Vector reqNames = new Vector();
Vector respNames = new Vector();
@@ -816,7 +818,7 @@
if ((classname == null) || classname.equals(""))
throw new AxisFault("Server.Admin.error",
- "No classname attribute in type mapping",
+ JavaUtils.getMessage("noClassname00"),
null, null);
// Resolve class name
@@ -840,7 +842,7 @@
String localName = elem.getLocalName();
qn = new QName(namespaceURI, localName);
- category.debug( "Registering mapping for " + qn + " -> " + classname);
+ category.debug( JavaUtils.getMessage("registerTypeMap00", "" + qn, classname));
// register both serializers and deserializers for this bean
mapping.setQName(qn);
@@ -856,24 +858,23 @@
mapping.setQName(qn);
classname = elem.getAttribute("serializer");
- category.debug( "Serializer class is " + classname);
+ category.debug( JavaUtils.getMessage("serializer00", classname));
try {
cls = cl.loadClass(classname);
mapping.setSerializer(cls);
} catch (Exception e) {
throw new AxisFault( "Admin.error",
- "Couldn't load serializer class " + e.toString(),
+ JavaUtils.getMessage("noSerializer01", e.toString()),
null, null);
}
classname = elem.getAttribute("deserializerFactory");
- category.debug( "DeserializerFactory class is " + classname);
+ category.debug( JavaUtils.getMessage("deserFact00", classname));
try {
cls = cl.loadClass(classname);
mapping.setDeserializer(cls);
} catch (Exception e) {
throw new AxisFault( "Admin.error",
- "Couldn't load deserializerFactory " +
- e.toString(),
+ JavaUtils.getMessage("noDeserFact00", e.toString()),
null, null);
}
}
@@ -888,9 +889,9 @@
if ( args.length < 2 || !(args[0].equals("client") ||
args[0].equals("server")) ) {
- System.err.println( "Usage: Admin client|server <xml-file>\n" );
+ System.err.println( JavaUtils.getMessage("usage00", "Admin client|server <xml-file>") + "\n" );
- System.err.println( "Where <xml-file> looks like:" );
+ System.err.println( JavaUtils.getMessage("where00", "<xml-file>") );
System.err.println( "<deploy>" );
/*
System.err.println( " <transport name=a request=\"a,b,c\" sender=\"s\"");
@@ -929,7 +930,7 @@
try {
for ( i = 1 ; i < args.length ; i++ ) {
- System.out.println( "Processing '" + args[i] + "'" );
+ System.out.println( JavaUtils.getMessage("process00", args[i]) );
Document doc = XMLUtils.newDocument( new FileInputStream( args[i] ) );
admin.process(msgContext, doc.getDocumentElement());
}
@@ -940,7 +941,7 @@
throw e;
}
catch( Exception e ) {
- System.err.println( "Error processing '" + args[i] + "'" );
+ System.err.println( JavaUtils.getMessage("errorProcess00", args[i]) );
e.printStackTrace( System.err );
//System.exit( 1 );
throw e;
1.10 +2 -2 xml-axis/java/src/org/apache/axis/utils/JavaUtils.java
Index: JavaUtils.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/utils/JavaUtils.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- JavaUtils.java 2001/11/05 20:47:08 1.9
+++ JavaUtils.java 2001/11/08 21:43:59 1.10
@@ -86,8 +86,8 @@
*/
public static Object convert(Object arg, Class destClass)
{
- category.debug( "Trying to convert " + arg.getClass().getName() +
- " to " + destClass.getName());
+ category.debug( getMessage("convert00",
+ arg.getClass().getName(), destClass.getName()));
if (!(arg instanceof List))
return arg;
1.14 +5 -5 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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- NSStack.java 2001/10/30 16:46:41 1.13
+++ NSStack.java 2001/11/08 21:43:59 1.14
@@ -115,7 +115,7 @@
public ArrayList pop() {
if (stack.isEmpty()) {
if (category.isDebugEnabled())
- category.debug("NSPop (empty)");
+ category.debug("NSPop (" + JavaUtils.getMessage("empty00") + ")");
if (parent != null)
return parent.pop();
return null;
@@ -199,7 +199,7 @@
return parent.getNamespaceURI(prefix);
if (category.isDebugEnabled()){
- category.debug("didn't find prefix '" + prefix + "'");
+ category.debug(JavaUtils.getMessage("noPrefix00", prefix));
dump();
}
@@ -233,7 +233,7 @@
ArrayList list = (ArrayList)e.nextElement();
System.out.println("----");
if (list == null) {
- System.out.println("null table??");
+ System.out.println(JavaUtils.getMessage("nullTable00"));
continue;
}
for (int i = 0; i < list.size(); i++) {
@@ -244,10 +244,10 @@
}
if (parent != null) {
- System.out.println("----parent");
+ System.out.println("----" + JavaUtils.getMessage("parent00"));
parent.dump();
}
- System.out.println("----end");
+ System.out.println("----" + JavaUtils.getMessage("end00"));
}
}
1.22 +2 -3 xml-axis/java/src/org/apache/axis/utils/Options.java
Index: Options.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/utils/Options.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- Options.java 2001/10/30 16:46:41 1.21
+++ Options.java 2001/11/08 21:43:59 1.22
@@ -100,8 +100,7 @@
try {
getURL();
} catch( MalformedURLException e ) {
- category.error( "getURL failed to correctly process URL; protocol not " +
- "supported" );
+ category.error( JavaUtils.getMessage("cantDoURL00") );
throw e ;
}
getUser();
@@ -314,7 +313,7 @@
if ( port != null && !port.equals("-1")) tmp += ":" + port ;
if ( servlet != null ) tmp += servlet ;
} else tmp = url.toString();
- category.debug( "getURL returned: " + tmp );
+ category.debug( JavaUtils.getMessage("return02", "getURL", tmp) );
return( tmp );
}
1.8 +172 -0 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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- resources.properties 2001/11/07 20:00:22 1.7
+++ resources.properties 2001/11/08 21:43:59 1.8
@@ -4,15 +4,22 @@
# 3. If a single quote character is to appear in the resulting message, it must appear in this file as two consecutive single quote characters.
# 4. Lines beginning with "#" (like this one) are comment lines and may contain translation instructions. They need not be translated unless your translated file, rather than this file, will serve as a base for other translators.
+act00=Act as a...
addBody00=Adding body element to message...
addHeader00=Adding header to message...
addTrailer00=Adding trailer to message...
auth00=User ''{0}'' authenticated to server
auth01=User ''{0}'' authorized to ''{1}''
+# NOTE: in axisService00, do not translate "AXIS"
+axisService00=Hi there, this is an AXIS service!
+
# NOTE: in badArrayType00, do not translate "arrayTypeValue"
badArrayType00=Malformed arrayTypeValue ''{0}''
+# NOTE: in badAuth00, do not translate ""Basic""
+badAuth00=Bad authentication type (I can only handle "Basic").
+
badBool00=Invalid boolean
badChars00=Unexpected characters
badChars01=Bad character or insufficient number of characters in hex string
@@ -24,6 +31,14 @@
badNamespace00=Bad envelope namespace: {0}
badOffset00=Malformed offset attribute ''{0}''.
badPosition00=Malformed position attribute ''{0}''.
+badProxy00=Proxy port number, "{0}", incorrectly formatted
+
+# NOTE: in badRequest00, do not translate "GET", "POST"
+badRequest00=Cannot handle non-GET, non-POST request
+
+# NOTE: in badRootElem00, do not translate "clientdeploy", "deploy", "undeploy", "list", "passwd", "quit"
+badRootElem00=Root element must be ''clientdeploy'', ''deploy'', ''undeploy'', ''list'', ''passwd'', or ''quit''
+
badTag00=Bad envelope tag: {0}
badTime00=Invalid time
badTimezone00=Invalid timezone
@@ -31,6 +46,7 @@
beanSerConfigFail00=Exception configuring bean serialization for {0}
bodyElems00=There are {0} body elements.
bodyIs00=body is {0}
+buildChain00={0} building chain ''{1}''
cantAuth00=User ''{0}'' not authenticated (unknown user)
cantAuth01=User ''{0}'' not authenticated
cantAuth02=User ''{0}'' not authorized to ''{1}''
@@ -42,11 +58,17 @@
cantConvert03=Could not convert value to int
cantDoNullArray00=Cannot serialize null arrays just yet...
+
+# NOTE: in cantDoURL00, do not translate "getURL", "URL"
+cantDoURL00=getURL failed to correctly process URL; protocol not supported
+
cantHandle00={0} cannot handle structured data!
# NOTE: in cantInvoke00, do not translate "Call" or "URI"
cantInvoke00=Cannot invoke Call with null namespace URI for method {0}
+cantResolve00=Cannot resolve chain
+
# NOTE: in cantSerialize00, do not translate "ArraySerializer"
cantSerialize00=Cannot serialize a {0} with the ArraySerializer!
@@ -55,33 +77,72 @@
cantSerialize02=Cannot serialize a raw object
cantSetURI00=Cannot set location URI: {0}
+cantTunnel00=Unable to tunnel through {0}:{1}. Proxy returns "{2}"
changePwd00=Changing admin password
compiling00=Compiling: {0}
+convert00=Trying to convert {0} to {1}
copy00=copy {0} {1}
couldntCall00=Could not get a call
+
+# NOTE: in createdHTTP entries, do not translate "HTTP"
+createdHTTP00=Created an insecure HTTP connection
+createdHTTP01=Created an insecure HTTP connection using proxy {0}, port {1}
+
+# NOTE: in createdSSL00, do not translate "SSL"
+createdSSL00=Created an SSL connection
+
debugLevel00=Setting debug level to: {0}
+
+# NOTE: in defaultLogic00, do not translate "AxisServer"
+defaultLogic00=Calling default logic in AxisServer
+
+deployChain00=Deploying chain: {0}
+deployHandler00=Deploying handler: {0}
deployService00=Deploying service ''{0}'' into {1}
+deployService01=Deploying service: {0}
+deployTransport00=Deploying transport: {0}
+
+# NOTE: in deserFact00, do not translate "DeserializerFactory"
+deserFact00=DeserializerFactory class is {0}
+
+disabled00=functionality disabled.
dispatching00=Dispatching to a body namespace ''{0}''
doList00=Doing a list
+done00=Done processing
doQuit00=Doing a quit
elapsed00=Elapsed: {0} milliseconds
+empty00=empty
# NOTE: in enableTransport00, do not translate "SOAPService"
enableTransport00=SOAPService({0}) enabling transport {1}
+end00=end
endDoc00=End document
endDoc01=Done with document
endElem00=End element {0}
endPrefix00=End prefix mapping ''{0}''
enter00=Enter: {0}
+
+#NOTE: in error00, do not translate "AXIS"
+error00=AXIS error
+
errorInvoking00=Error invoking operation: {0}
+errorProcess00=Error processing ''{0}''
exit00=Exit: {0}
exit01=Exit: {0} no-argument constructor
+exit02=Exit: {0} - {1} is null
fault00=Fault occurred
+filename00=File name is: {0}
+filename01={0}: request file name = ''{1}''
+fromFile00=From file: ''{0}'':''{1}''
+got00=Got {0}
gotForID00=Got {0} for ID {1} (class = {2})
+gotPrincipal00=Got principal: {0}
+gotResponse00=Got response message
gotType00={0} got type {1}
gotValue00={0} got value {1}
headers00=headers
+hostname00=Target Hostname
# NOTE: in httpPassword00, do not translate HTTP
httpPassword00=HTTP password: {0}
@@ -91,24 +152,39 @@
inMsg00=In message: {0]
internalError00=Internal error
+internalError01=Internal server error
+
+# NOTE: in invokeGet00, do no translate "GET"
+invokeGet00=invoking via GET
+
invokeRequest00=Invoking request chain
invokeResponse00=Invoking response chain
invokeService00=Invoking service/pivot
+isNull00=is {0} null? {1}
# NOTE: in itemInMap00, do not translate "''item''" and "Map"
itemInMap00=Only ''item'' elements are allowed in a Map!
+listener00=Listener
+listenPort00=Listen port #
lookup00=Looking up method {0} in class {1}
makeEnvFail00=Could not make envelope
+match00={0} match: host: {1}, pattern: {2}
namesDontMatch00=Method names do not match\nBody method name = {0}\nService method names = {1}
namesDontMatch01=Method names do not match\nBody name = {0}\nService name = {1}\nService nameList = {2}
needPwd00=Must specify a password!
needService00=No target service to authorize for!
needUser00=Need to specify a user for authorization!
+never00={0}: this should never happen! {1}
# NOTE: in newElem00, do not translate "MessageElement"
newElem00=New MessageElement ({0}) named {1}
+# NOTE: in newTcpmon00, do not translate "TCP/IP"
+newTcpmon00=Create a new TCP/IP Monitor...
+
+no00=no {0}
+noAdminAccess00=Remote administrator access is not allowed!
noArrayArray00=Arrays of arrays are not supported ''{0}''.
# NOTE: in noArrayType00, do no translate "arrayType"
@@ -117,7 +193,12 @@
# NOTE: in noBeanHome00, do not translate "EJBProvider"
noBeanHome00=EJBProvider cannot get Bean Home
+noChains00=Services must use targeted chains
noClass00=Could not create class {0}
+
+# NOTE: in noClassname00, do not translate "classname"
+noClassname00=No classname attribute in type mapping
+
noComponent00=No component type for {0}
noConfig00=No engine configuration file - aborting!
@@ -129,19 +210,40 @@
# NOTE: in noCustomElems00, do not translate "<body>"
noCustomElems00=No custom elements allowed at top level until after the <body> tag
+noData00=No data
+noDeploy00=Could not generate deployment list!
noDeser00=No deserializer for {0}
+
+# NOTE: in noDeserFact00, do not translate "DeserializerFactory"
+noDeserFact00=Could not load DeserializerFactory {0}
+
noDeser01=Deserializing parameter ''{0}'': could not find deserializer for type {1}
noDoc00=Could not get DOM document: XML was "{0}"
+
+# NOTE: in noEngine00, do not translate "AXIS"
+noEngine00=Could not find AXIS engine!
+
+# NOTE: in noEngineConfig00, do not translate "engineConfig"
+noEngineConfig00=Wanted ''engineConfig'' element, got ''{0}''
+
noHandler00=Cannot locate handler: {0}
# NOTE: in noHandler01, do not translate "QName"
noHandler01=No handler for QName {0}
+noHandler02=Could not find registered handler ''{0}''
+
+noHeader00=no {0} header!
+
# NOTE: in noInstructions00, do not translate "SOAP"
noInstructions00=Processing instructions are not allowed within SOAP messages
+# NOTE: in noJSSE00, do not translate "SSL", JSSE", "classpath"
+noJSSE00=SSL feature disallowed: JSSE files not installed or present in classpath
+
noMap00={0}: {1} is not a map
noMethod00=Method not found\nMethod name = {0}\nService name = {1}
+noMethod01=No method!
noMultiArray00=Multidimensional arrays are not supported ''{0}''.
noOperation00=No operation name specified!
noOperation01=Cannot find operation: {0} - none defined
@@ -151,6 +253,8 @@
# NOTE: in noParent00, do not translate "SOAPTypeMappingRegistry"
noParent00=no SOAPTypeMappingRegistry parent
+noPivot00=No pivot handler ''{0}'' found!
+
# NOTE: in noPort00, do not translate "port"
noPort00=Cannot find port: {0}
@@ -158,6 +262,7 @@
noPortType00=Cannot find portType: {0}
noPrefix00={0} did not find prefix: {1}
+noPrincipal00=No principal!
noProviderElem00=The required provider element is missing
noRecorder00=No event recorder inside element
@@ -166,14 +271,19 @@
noRequest01=No request chain
noResponse00=No response chain
+noResponse01=No response message!
noRoles00=No roles specified for target service, allowing.
noRoles01=No roles specified for target service, disallowing.
noSerializer00=No serializer found for class {0} in registry {1}
+noSerializer01=Could not load serializer class {0}
noService00=Cannot find service: {0}
noService01=No service has been defined
noService02=This service is not available at this endpoint ({0}).
noService03=No service/pivot
+#NOTE: in noService04, do not translate "AXIS", "targetService"
+noService04=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!
@@ -196,6 +306,9 @@
# NOTE: in noValue00, do not translate "value", "RPCParam"
noValue00=No value field for RPCParam to use?!? {0}
+# NOTE: in noWSDL00, do not translate "WSDL"
+noWSDL00=Could not generate WSDL!
+
# NOTE: in nullCall00, do not translate "AdminClient" or "''call''"
nullCall00=AdminClient did not initialize correctly: ''call'' is null!
@@ -205,7 +318,9 @@
nullHandler00={0}: Null handler;
nullParent00=null parent!
nullResponse00=Null response message!
+nullTable00=null table??
oddDigits00=Odd number of digits in hex string
+ok00=OK
# NOTE: in the only1Body00, do not translate "Body"
only1Body00=Only one Body element allowed!
@@ -214,26 +329,63 @@
only1Header00=Only one Header element allowed!
outMsg00=Out message: {0}
+params00=Parameters are: {0}
+parent00=parent
parmMismatch00=Number of parameters passed in ({0}) doesn''t match the number of IN/INOUT parameters ({1}) from the addParameter() calls
password00=Password: {0}
+perhaps00=Perhaps there will be a form for invoking the service here...
popHandler00=Popping handler {0}
+port00=Target Port #
problemDeploying00=Problem deploying!
+process00=Processing ''{0}''
processFile00=Processing file {0}
+proxy00=Proxy
pushHandler00=Pushing handler {0}
+quit00={0} quitting.
+quitRequest00=Administration service requested to quit, quitting.
+
+# NOTE: in reachedServer00, do not translate "SimpleAxisServer"
+reachedServer00=You have reached the SimpleAxisServer.
+
+# NOTE: in reachedServlet00, do not translate "AXIS HTTP Servlet", "URL", "SOAP"
+reachedServlet00=Hi, you have reached the AXIS HTTP Servlet. Normally you would be hitting this URL with a SOAP client rather than a browser.
+
register00=register ''{0}'' - ''{1}''
registerTypeMap00=Registering type mapping {0} -> {1}
+registryAdd00=Registry {0} adding ''{1}'' ({2})
result00=Got result: {0}
removeBody00=Removing body element from message...
removeHeader00=Removing header from message...
removeTrailer00=Removing trailer from message...
+return00={0} returning new instance of {1}
+return01=return code: {0}\n{1}
+return02={0} returned: {1}
+returnChain00={0} returning chain ''{1}''
saveConfigFail00=Could not write engine config!
# NOTE: in semanticCheck00, do not translate "SOAP"
semanticCheck00=Doing SOAP semantic checks...
+# NOTE: in sendingXML00, do not translate "XML"
+sendingXML00={0} sending XML:
+
+serializer00=Serializer class is {0}
+serverDisabled00=This Axis server is not currently accepting requests.
+
+# NOTE: in serverFault00, do not translate "HTTP"
+serverFault00=HTTP server fault
+
+serverRun00=Server is running
+serverStop00=Server is stopped
setCurrMsg00=Setting current message form to: {0} (currentMessage is now {1})
setProp00=Setting {0} property in {1}
+
+# NOTE: in setupTunnel00, do not translate "SSL"
+setupTunnel00=Set up SSL tunnelling through {0}:{1}
+
setValueInTarget00=Set value {0} in target {1}
+somethingWrong00=Sorry, something seems to have gone wrong... here are the details:
+start00={0} starting up.
startElem00=Start element {0}
startPrefix00=Start prefix mapping ''{0}'' -> ''{1}''
test00=...
@@ -243,7 +395,13 @@
test04=.{0} {1} {2} ... {3} {2} {4} {5}.
timeout00=Session id {0} timed out.
transport00=Transport is {0}
+transport01={0}: Transport = ''{1}''
+
+# NOTE: in transportName00, do not translate "AXIS"
+transportName00=In case you are interested, my AXIS transport name appears to be ''{0}''
+tryingLoad00=Trying to load class: {0}
+
# NOTE: in typeFromAttr00, do not translate "Type"
typeFromAttr00=Type from attributes is: {0}
@@ -255,12 +413,26 @@
# NOTE: in typeSetNotAllowed00, do not translate "Type"
typeSetNotAllowed00={0} disallows setting of Type
+unauth00=Unauthorized
+undeploy00=Undeploying {0}
+unexpectedDesc00=Unexpected {0} descriptor
+unexpectedEOS00=Unexpected end of stream
+unexpectedUnknown00=Unexpected unknown element
+unknownHost00=Unknown host - could not verify admininistrator access
+unknownType00=Unknown type: {0}
+unknownType01=Unknown type to {0}
unregistered00=Unregistered type: {0}
usage00=Usage: {0}
user00=User: {0}
+usingServer00={0} using server {1}
value00=value: {0}
+where00=Where {0} looks like:
# NOTE: in withParent00, do not translate "SOAPTypeMappingRegistry"
withParent00=SOAPTypeMappingRegistry with parent
wsdlError00=Error processing WSDL document: {0} {1}
wsdlMissing00=Missing WSDL document
+
+# NOTE: in xml entries, do not translate "XML"
+xmlRecd00=XML received:
+xmlSent00=XML sent: