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 he...@apache.org on 2004/12/02 09:35:38 UTC
svn commit: r109478 - in webservices/axis/trunk/java/dev/scratch/prototype2/src: java/org/apache/axis/encoding java/org/apache/axis/i18n java/org/apache/axis/transport/http java/org/apache/axis/utils test-resources/deployment/modules test-resources/deployment/services
Author: hemapani
Date: Thu Dec 2 00:35:37 2004
New Revision: 109478
URL: http://svn.apache.org/viewcvs?view=rev&rev=109478
Log:
remove i18n and cleaning the code
Removed:
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/i18n/
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/utils/Messages.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/test-resources/deployment/modules/
webservices/axis/trunk/java/dev/scratch/prototype2/src/test-resources/deployment/services/
Modified:
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/encoding/Base64.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/transport/http/SimpleAxisServer.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/transport/http/SimpleAxisWorker.java
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/encoding/Base64.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/encoding/Base64.java?view=diff&rev=109478&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/encoding/Base64.java&r1=109477&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/encoding/Base64.java&r2=109478
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/encoding/Base64.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/encoding/Base64.java Thu Dec 2 00:35:37 2004
@@ -15,8 +15,6 @@
*/
package org.apache.axis.encoding ;
-import org.apache.axis.utils.Messages;
-
import java.io.IOException;
import java.io.OutputStream;
import java.io.Writer;
@@ -66,7 +64,7 @@
obuf[wp] = (byte)(b2 << 6 & 0xc0 | b3 & 0x3f);
return 3;
default:
- throw new RuntimeException(Messages.getMessage("internalError00"));
+ throw new RuntimeException("Internal error");
}
}
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/transport/http/SimpleAxisServer.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/transport/http/SimpleAxisServer.java?view=diff&rev=109478&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/transport/http/SimpleAxisServer.java&r1=109477&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/transport/http/SimpleAxisServer.java&r2=109478
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/transport/http/SimpleAxisServer.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/transport/http/SimpleAxisServer.java Thu Dec 2 00:35:37 2004
@@ -19,7 +19,6 @@
import org.apache.axis.engine.AxisEngine;
-import org.apache.axis.utils.Messages;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -77,7 +76,6 @@
* Axis engine for processing.
*/
public void run() {
- System.out.println("request accepted");
// Accept and process requests from the socket
while (!stopped) {
Socket socket = null;
@@ -86,7 +84,7 @@
} catch (java.io.InterruptedIOException iie) {
} catch (Exception e) {
- log.debug(Messages.getMessage("exception00"), e);
+ log.debug(e.getMessage(), e);
break;
}
if (socket != null) {
@@ -94,7 +92,7 @@
worker.run();
}
}
- log.info(Messages.getMessage("quit00", "SimpleAxisServer"));
+ log.info("Simple Axis Server Quit");
}
@@ -144,12 +142,12 @@
serverSocket.close();
}
} catch (IOException e) {
- log.info(Messages.getMessage("exception00"), e);
+ log.info(e);
} finally {
serverSocket=null;
}
- log.info(Messages.getMessage("quit00", "SimpleAxisServer"));
+ log.info("Simple Axis Server Quits");
}
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/transport/http/SimpleAxisWorker.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/transport/http/SimpleAxisWorker.java?view=diff&rev=109478&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/transport/http/SimpleAxisWorker.java&r1=109477&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/transport/http/SimpleAxisWorker.java&r2=109478
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/transport/http/SimpleAxisWorker.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/transport/http/SimpleAxisWorker.java Thu Dec 2 00:35:37 2004
@@ -22,7 +22,6 @@
import org.apache.axis.engine.registry.EngineRegistry;
import org.apache.axis.om.OMXMLParserWrapper;
import org.apache.axis.impl.llom.wrapper.OMXPPWrapper;
-import org.apache.axis.utils.Messages;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.xmlpull.v1.XmlPullParser;
@@ -48,11 +47,11 @@
private static String transportName = "SimpleHTTP";
// HTTP status codes
- private static byte OK[] = ("200 " + Messages.getMessage("ok00")).getBytes();
- private static byte NOCONTENT[] = ("202 " + Messages.getMessage("ok00") + "\n\n").getBytes();
- private static byte UNAUTH[] = ("401 " + Messages.getMessage("unauth00")).getBytes();
+ private static byte OK[] = ("200 OK").getBytes();
+ private static byte NOCONTENT[] = ("202 OK\n\n").getBytes();
+ private static byte UNAUTH[] = ("401 Unauthorized").getBytes();
private static byte SENDER[] = "400".getBytes();
- private static byte ISE[] = ("500 " + Messages.getMessage("internalError01")).getBytes();
+ private static byte ISE[] = ("500 Internal server error").getBytes();
// HTTP prefix
private static byte HTTP[] = "HTTP/1.0 ".getBytes();
@@ -210,10 +209,6 @@
String params = fileName.substring(paramIdx + 1);
fileName.setLength(paramIdx);
- log.debug(Messages.getMessage("filename00",
- fileName.toString()));
- log.debug(Messages.getMessage("params00",
- params));
if ("wsdl".equalsIgnoreCase(params))
doWsdl = true;
@@ -252,10 +247,6 @@
authBuf.append((char) (decoded[i] & 0x7f));
}
- if (log.isDebugEnabled()) {
- log.debug(Messages.getMessage("user00",
- userBuf.toString()));
- }
msgContext.setProperty(MessageContext.USER_NAME,userBuf.toString());
msgContext.setProperty(MessageContext.PASSWARD,pwBuf.toString());
@@ -316,7 +307,7 @@
// out.write(response);
} catch (Exception e) {
- log.info(Messages.getMessage("exception00"), e);
+ log.info(e);
} finally {
try {
if (socket != null) socket.close();
@@ -361,7 +352,7 @@
n = this.readLine(is, buf, 0, buf.length);
if (n < 0) {
// nothing!
- throw new java.io.IOException(Messages.getMessage("unexpectedEOS00"));
+ throw new java.io.IOException("Unexpected end of stream");
}
// which does it begin with?
@@ -378,7 +369,6 @@
break;
fileName.append(c);
}
- log.debug(Messages.getMessage("filename01", "SimpleAxisServer", fileName.toString()));
return 0;
} else if (buf[0] == postHeader[0]) {
httpRequest.append("POST");
@@ -388,9 +378,8 @@
break;
fileName.append(c);
}
- log.debug(Messages.getMessage("filename01", "SimpleAxisServer", fileName.toString()));
} else {
- throw new java.io.IOException(Messages.getMessage("badRequest00"));
+ throw new java.io.IOException("Cannot handle non-GET, non-POST request");
}
while ((n = readLine(is, buf, 0, buf.length)) > 0) {
@@ -443,8 +432,7 @@
}
// headers.addHeader(HTTPConstants.HEADER_AUTHORIZATION, new String(basicAuth) + authInfo.toString());
} else {
- throw new java.io.IOException(
- Messages.getMessage("badAuth00"));
+ throw new java.io.IOException("Bad authentication type (I can only handle \"Basic\")");
}
} else if (endHeaderIndex == locationLen && matches(buf, locationHeader)) {
while (++i < n && (buf[i] != '\r') && (buf[i] != '\n')) {
Deleted: /webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/utils/Messages.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/utils/Messages.java?view=auto&rev=109477
==============================================================================