rsitze 2002/07/02 11:26:16
Modified: java/src/org/apache/axis/providers/java EJBProvider.java
java/src/org/apache/axis/handlers BasicHandler.java
java/src/org/apache/axis/server AxisServer.java
java/src/org/apache/axis AxisEngine.java
java/src/org/apache/axis/transport/http HTTPSender.java
java/src/org/apache/axis/utils NSStack.java
java/src/org/apache/axis/encoding/ser BeanSerializer.java
java/src/org/apache/axis/encoding
SerializationContextImpl.java
Added: java/src/org/apache/axis AxisInternalServices.java
Log:
Localizing external service interfaces
Revision Changes Path
1.24 +1 -1
xml-axis/java/src/org/apache/axis/providers/java/EJBProvider.java
Index: EJBProvider.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/providers/java/EJBProvider.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- EJBProvider.java 2 Jul 2002 18:07:33 -0000 1.23
+++ EJBProvider.java 2 Jul 2002 18:26:15 -0000 1.24
@@ -323,7 +323,7 @@
// if we got any stuff from the configuration file
// create a new context using these properties
// otherwise, we get a default context and cache it for next time
- return ((properties == null)
+ return ((properties == null)
? getCachedContext()
: new InitialContext(properties));
}
1.34 +7 -0 xml-axis/java/src/org/apache/axis/handlers/BasicHandler.java
Index: BasicHandler.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/handlers/BasicHandler.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- BasicHandler.java 2 Jul 2002 18:07:31 -0000 1.33
+++ BasicHandler.java 2 Jul 2002 18:26:15 -0000 1.34
@@ -219,4 +219,11 @@
public List getUnderstoodHeaders() {
return null;
}
+
+ /**
+ * Hook to axis service... for now hardwire
+ */
+ protected static final String getGlobalProperty(String property) {
+ return AxisInternalServices.getGlobalProperty(property);
+ }
}
1.73 +1 -1 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.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- AxisServer.java 2 Jul 2002 18:07:33 -0000 1.72
+++ AxisServer.java 2 Jul 2002 18:26:15 -0000 1.73
@@ -87,7 +87,7 @@
public static AxisServer getServer(Map environment) throws AxisFault
{
if (factory == null) {
- String factoryClassName =
AxisInternalServices.getGlobalProperty("axis.ServerFactory");
+ String factoryClassName = getGlobalProperty("axis.ServerFactory");
if (factoryClassName != null) {
try {
Class factoryClass = ClassUtils.forName(factoryClassName);
1.86 +1 -1 xml-axis/java/src/org/apache/axis/AxisEngine.java
Index: AxisEngine.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/AxisEngine.java,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- AxisEngine.java 2 Jul 2002 18:07:26 -0000 1.85
+++ AxisEngine.java 2 Jul 2002 18:26:15 -0000 1.86
@@ -183,7 +183,7 @@
/*Set the default attachment implementation */
setOptionDefault(PROP_ATTACHMENT_IMPLEMENTATION,
- AxisInternalServices.getGlobalProperty("axis." +
PROP_ATTACHMENT_IMPLEMENTATION ));
+ getGlobalProperty("axis." + PROP_ATTACHMENT_IMPLEMENTATION
));
setOptionDefault(PROP_ATTACHMENT_IMPLEMENTATION, DEFAULT_ATTACHMENT_IMPL);
1.3 +0 -0 xml-axis/java/src/org/apache/axis/AxisInternalServices.java
1.74 +16 -16 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.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- HTTPSender.java 2 Jul 2002 18:07:34 -0000 1.73
+++ HTTPSender.java 2 Jul 2002 18:26:15 -0000 1.74
@@ -190,19 +190,19 @@
}
// Get https.proxyXXX settings
- String tunnelHost =
AxisInternalServices.getGlobalProperty("https.proxyHost");
- String tunnelPortStr =
AxisInternalServices.getGlobalProperty("https.proxyPort");
- String nonProxyHosts =
AxisInternalServices.getGlobalProperty("https.nonProxyHosts");
+ String tunnelHost = getGlobalProperty("https.proxyHost");
+ String tunnelPortStr = getGlobalProperty("https.proxyPort");
+ String nonProxyHosts = getGlobalProperty("https.nonProxyHosts");
// Use http.proxyXXX settings if https.proxyXXX is not set
if (tunnelHost == null) {
- tunnelHost = AxisInternalServices.getGlobalProperty("http.proxyHost");
+ tunnelHost = getGlobalProperty("http.proxyHost");
}
if (tunnelPortStr == null) {
- tunnelPortStr =
AxisInternalServices.getGlobalProperty("http.proxyPort");
+ tunnelPortStr = getGlobalProperty("http.proxyPort");
}
if (nonProxyHosts == null) {
- nonProxyHosts =
AxisInternalServices.getGlobalProperty("http.nonProxyHosts");
+ nonProxyHosts = getGlobalProperty("http.nonProxyHosts");
}
boolean hostInNonProxyList = isHostInNonProxyList(host, nonProxyHosts);
@@ -224,7 +224,7 @@
Object factory = null;
// Hook in a different SSL socket factory
- String socketFactoryClass =
AxisInternalServices.getGlobalProperty("axis.socketFactory");
+ String socketFactoryClass = getGlobalProperty("axis.socketFactory");
if (socketFactoryClass != null) {
try {
Class c1 = ClassUtils.forName(socketFactoryClass);
@@ -272,14 +272,14 @@
PrintWriter out = new PrintWriter(
new BufferedWriter(
new OutputStreamWriter(tunnelOutputStream)));
- String tunnelUser =
AxisInternalServices.getGlobalProperty("https.proxyUser");
- String tunnelPassword =
AxisInternalServices.getGlobalProperty("https.proxyPassword");
+ String tunnelUser = getGlobalProperty("https.proxyUser");
+ String tunnelPassword = getGlobalProperty("https.proxyPassword");
if (tunnelUser == null) {
- tunnelUser =
AxisInternalServices.getGlobalProperty("http.proxyUser");
+ tunnelUser = getGlobalProperty("http.proxyUser");
}
if (tunnelPassword == null) {
- tunnelPassword =
AxisInternalServices.getGlobalProperty("http.proxyPassword");
+ tunnelPassword = getGlobalProperty("http.proxyPassword");
}
// More secure version... engage later?
@@ -400,12 +400,12 @@
String host, int port, StringBuffer otherHeaders, BooleanHolder
useFullURL)
throws IOException {
Socket sock = null;
- String proxyHost = AxisInternalServices.getGlobalProperty("http.proxyHost");
- String proxyPort = AxisInternalServices.getGlobalProperty("http.proxyPort");
- String nonProxyHosts =
AxisInternalServices.getGlobalProperty("http.nonProxyHosts");
+ String proxyHost = getGlobalProperty("http.proxyHost");
+ String proxyPort = getGlobalProperty("http.proxyPort");
+ String nonProxyHosts = getGlobalProperty("http.nonProxyHosts");
boolean hostInNonProxyList = isHostInNonProxyList(host, nonProxyHosts);
- String proxyUsername =
AxisInternalServices.getGlobalProperty("http.proxyUser");
- String proxyPassword =
AxisInternalServices.getGlobalProperty("http.proxyPassword");
+ String proxyUsername = getGlobalProperty("http.proxyUser");
+ String proxyPassword = getGlobalProperty("http.proxyPassword");
if (proxyUsername != null) {
StringBuffer tmpBuf = new StringBuffer();
1.24 +2 -2 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.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- NSStack.java 1 Jul 2002 16:09:38 -0000 1.23
+++ NSStack.java 2 Jul 2002 18:26:15 -0000 1.24
@@ -54,8 +54,8 @@
*/
package org.apache.axis.utils;
+import org.apache.axis.AxisInternalServices;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import java.util.ArrayList;
import java.util.Enumeration;
@@ -68,7 +68,7 @@
*/
public class NSStack {
protected static Log log =
- LogFactory.getLog(NSStack.class.getName());
+ AxisInternalServices.getLog(NSStack.class.getName());
private static final ArrayList EMPTY = new ArrayList();
1.39 +2 -2
xml-axis/java/src/org/apache/axis/encoding/ser/BeanSerializer.java
Index: BeanSerializer.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/encoding/ser/BeanSerializer.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- BeanSerializer.java 1 Jul 2002 16:09:39 -0000 1.38
+++ BeanSerializer.java 2 Jul 2002 18:26:15 -0000 1.39
@@ -56,6 +56,7 @@
package org.apache.axis.encoding.ser;
import org.apache.axis.AxisFault;
+import org.apache.axis.AxisInternalServices;
import org.apache.axis.Constants;
import org.apache.axis.description.FieldDesc;
import org.apache.axis.description.TypeDesc;
@@ -67,7 +68,6 @@
import org.apache.axis.utils.JavaUtils;
import org.apache.axis.wsdl.fromJava.Types;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.w3c.dom.Element;
import org.xml.sax.Attributes;
import org.xml.sax.helpers.AttributesImpl;
@@ -91,7 +91,7 @@
public class BeanSerializer implements Serializer, Serializable {
protected static Log log =
- LogFactory.getLog(BeanSerializer.class.getName());
+ AxisInternalServices.getLog(BeanSerializer.class.getName());
QName xmlType;
Class javaType;
1.38 +2 -2
xml-axis/java/src/org/apache/axis/encoding/SerializationContextImpl.java
Index: SerializationContextImpl.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/encoding/SerializationContextImpl.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- SerializationContextImpl.java 1 Jul 2002 19:37:52 -0000 1.37
+++ SerializationContextImpl.java 2 Jul 2002 18:26:15 -0000 1.38
@@ -56,6 +56,7 @@
package org.apache.axis.encoding;
import org.apache.axis.AxisEngine;
+import org.apache.axis.AxisInternalServices;
import org.apache.axis.Constants;
import org.apache.axis.Message;
import org.apache.axis.MessageContext;
@@ -73,7 +74,6 @@
import org.apache.axis.utils.XMLUtils;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.w3c.dom.Attr;
import org.w3c.dom.Element;
@@ -106,7 +106,7 @@
public class SerializationContextImpl implements SerializationContext
{
protected static Log log =
- LogFactory.getLog(SerializationContextImpl.class.getName());
+ AxisInternalServices.getLog(SerializationContextImpl.class.getName());
private NSStack nsStack = new NSStack();
private boolean writingStartTag = false;
