You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juddi.apache.org by sv...@apache.org on 2005/02/01 03:52:03 UTC
cvs commit: ws-juddi/src/java/org/apache/juddi/proxy AxisTransport.java RegistryProxy.java Transport.java
sviens 2005/01/31 18:52:03
Modified: src/java/org/apache/juddi/proxy AxisTransport.java
RegistryProxy.java Transport.java
Log:
Removed support for jUDDI-managed HTTP proxy values. Proxy information should be set using -D JVM parameters.
Revision Changes Path
1.5 +1 -15 ws-juddi/src/java/org/apache/juddi/proxy/AxisTransport.java
Index: AxisTransport.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/proxy/AxisTransport.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AxisTransport.java 24 Aug 2004 17:49:59 -0000 1.4
+++ AxisTransport.java 1 Feb 2005 02:52:03 -0000 1.5
@@ -40,21 +40,7 @@
public Element send(Element request,URL endpointURL)
throws RegistryException
- {
- return this.send(request,endpointURL,false,null,0);
- }
-
- public Element send(Element request,URL endpointURL,boolean proxySet,String proxyHost,int proxyPort)
- throws RegistryException
- {
- // make sure we're using the correct proxy
- if (proxySet)
- {
- System.setProperty("http.proxySet",String.valueOf(proxySet));
- System.setProperty("http.proxyHost",proxyHost);
- System.setProperty("http.proxyPort",String.valueOf(proxyPort));
- }
-
+ {
Service service = null;
Call call = null;
Element response = null;
1.15 +1 -73 ws-juddi/src/java/org/apache/juddi/proxy/RegistryProxy.java
Index: RegistryProxy.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/proxy/RegistryProxy.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- RegistryProxy.java 4 Jan 2005 04:03:00 -0000 1.14
+++ RegistryProxy.java 1 Feb 2005 02:52:03 -0000 1.15
@@ -75,9 +75,6 @@
public static final String DEFAULT_PROTOCOL_HANDLER = "com.sun.net.ssl.internal.www.protocol";
public static final String DEFAULT_UDDI_VERSION = "2.0";
public static final String DEFAULT_UDDI_NAMESPACE = "urn:uddi-org:api_v2";
- public static final String DEFAULT_HTTP_PROXY_SET = "false";
- public static final String DEFAULT_HTTP_PROXY_HOST = null;
- public static final String DEFAULT_HTTP_PROXY_PORT = "0";
// jUDDI Proxy Properties
private URL inquiryURL;
@@ -88,9 +85,6 @@
private String protocolHandler;
private String uddiVersion;
private String uddiNamespace;
- private boolean httpProxySet;
- private String httpProxyHost;
- private int httpProxyPort;
/**
* Create a new instance of RegistryProxy. This constructor
@@ -193,24 +187,6 @@
else
this.setUddiNamespace(DEFAULT_UDDI_NAMESPACE);
- String proxySet = props.getProperty(HTTP_PROXY_SET_PROPERTY_NAME);
- if (proxySet != null)
- this.setHttpProxySet(Boolean.getBoolean(proxySet));
- else
- this.setHttpProxySet(Boolean.getBoolean(DEFAULT_HTTP_PROXY_SET));
-
- String proxyHost = props.getProperty(HTTP_PROXY_HOST_PROPERTY_NAME);
- if (proxyHost != null)
- this.setHttpProxyHost(proxyHost);
- else
- this.setHttpProxyHost(DEFAULT_HTTP_PROXY_HOST);
-
- String proxyPort = props.getProperty(HTTP_PROXY_PORT_PROPERTY_NAME);
- if (proxyPort != null)
- this.setHttpProxyPort(Integer.parseInt(proxyPort));
- else
- this.setHttpProxyPort(Integer.parseInt(DEFAULT_HTTP_PROXY_PORT));
-
String transClass = props.getProperty(TRANSPORT_CLASS_PROPERTY_NAME);
if (transClass != null)
this.setTransport(this.getTransport(transClass));
@@ -345,54 +321,6 @@
{
this.uddiVersion = uddiVer;
}
-
- /**
- * @return Returns the httpProxySet.
- */
- public boolean isHttpProxySet()
- {
- return httpProxySet;
- }
-
- /**
- * @param httpProxySet The httpProxySet to set.
- */
- public void setHttpProxySet(boolean httpProxySet)
- {
- this.httpProxySet = httpProxySet;
- }
-
- /**
- * @return Returns the httpProxyHost.
- */
- public String getHttpProxyHost()
- {
- return httpProxyHost;
- }
-
- /**
- * @param httpProxyHost The httpProxyHost to set.
- */
- public void setHttpProxyHost(String httpProxyHost)
- {
- this.httpProxyHost = httpProxyHost;
- }
-
- /**
- * @return Returns the httpProxyPort.
- */
- public int getHttpProxyPort()
- {
- return httpProxyPort;
- }
-
- /**
- * @param httpProxyPort The httpProxyPort to set.
- */
- public void setHttpProxyPort(int httpProxyPort)
- {
- this.httpProxyPort = httpProxyPort;
- }
/**
*
@@ -440,7 +368,7 @@
// A SOAP request is made and a SOAP response
// is returned.
- Element response = transport.send(request,endPointURL,httpProxySet,httpProxyHost,httpProxyPort);
+ Element response = transport.send(request,endPointURL);
// First, let's make sure that a response
// (any response) is found in the SOAP Body.
1.3 +0 -3 ws-juddi/src/java/org/apache/juddi/proxy/Transport.java
Index: Transport.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/proxy/Transport.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Transport.java 1 May 2004 00:51:40 -0000 1.2
+++ Transport.java 1 Feb 2005 02:52:03 -0000 1.3
@@ -27,7 +27,4 @@
{
Element send(Element request,URL endPointURL)
throws RegistryException;
-
- Element send(Element request,URL endPointURL,boolean proxySet,String proxyHost,int proxyPort)
- throws RegistryException;
}
\ No newline at end of file