diff options
author | cbrealey | 2004-11-24 18:41:47 +0000 |
---|---|---|
committer | cbrealey | 2004-11-24 18:41:47 +0000 |
commit | e27f8f6c72639b36c67238d9fd68fa7868dce74e (patch) | |
tree | 5ae24c7279052abe46a58be836881329d67b7563 /bundles/org.eclipse.wst.ws.parser | |
parent | a92ebe94803347acaf96d443ef5a509fa8ccaab2 (diff) | |
download | webtools.webservices-e27f8f6c72639b36c67238d9fd68fa7868dce74e.tar.gz webtools.webservices-e27f8f6c72639b36c67238d9fd68fa7868dce74e.tar.xz webtools.webservices-e27f8f6c72639b36c67238d9fd68fa7868dce74e.zip |
[79427] Removed IBM JSSE from org.eclipse.wst.ws.parser
Diffstat (limited to 'bundles/org.eclipse.wst.ws.parser')
2 files changed, 2 insertions, 39 deletions
diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/parser/discovery/NetUtils.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/parser/discovery/NetUtils.java index 41d3e3338..e96dd33f7 100644 --- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/parser/discovery/NetUtils.java +++ b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/parser/discovery/NetUtils.java @@ -23,17 +23,8 @@ import org.apache.soap.transport.http.SOAPHTTPConnection; import sun.misc.BASE64Encoder; -import com.ibm.jsse.JSSEProvider; -import com.ibm.net.ssl.internal.www.protocol.https.Handler; - public final class NetUtils { - // Initialize the SSL provider subsystem. - static - { - Security.addProvider(new JSSEProvider()); - System.setProperty("java.protocol.handler.pkgs","com.ibm.net.ssl.internal.www.protocol"); - } /** * Get the java.net.URLConnection given a string representing the URL. This class ensures @@ -70,19 +61,6 @@ public final class NetUtils return null; } - public static final void adjustSecurityProviderList() - { - // Ensure that the JSSE provider is first. This worksaround a WAS V502 issue where the IBMJSSEFIPS is added first. - Provider jsseProvider = Security.getProvider("JSSE"); - Security.removeProvider("JSSE"); - if (jsseProvider == null) - { - jsseProvider = new JSSEProvider(); - System.setProperty("java.protocol.handler.pkgs","com.ibm.net.ssl.internal.www.protocol"); - } - Security.insertProviderAt(jsseProvider,1); - } - /** * Get the java.io.InputStream for a URL given a string representing the URL. This class * ensures that proxy settings in WSAD are respected. @@ -131,21 +109,13 @@ public final class NetUtils } /** - * Create a URL from a string and provide an SSL handler if applicable. + * Create a URL from a string. * @param urlString String representing the URL. * @return URL java.lang.URL representation of the URL. * @throws MalformedURLException */ public static final URL createURL(String urlString) throws MalformedURLException { - URL url; - if (urlString.startsWith("https")) - { - adjustSecurityProviderList(); - url = new URL(null,urlString,new Handler()); - } - else - url = new URL(urlString); - return url; + return new URL(urlString); } }
\ No newline at end of file diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/parser/discovery/WebServicesParserExt.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/parser/discovery/WebServicesParserExt.java index aad5a8bba..2f02088a4 100644 --- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/parser/discovery/WebServicesParserExt.java +++ b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/parser/discovery/WebServicesParserExt.java @@ -17,14 +17,7 @@ import java.security.Security; import org.eclipse.wst.ws.parser.wsil.WebServicesParser; -import com.ibm.jsse.JSSEProvider; - public class WebServicesParserExt extends WebServicesParser { - // Initialize the SSL provider subsystem. - static { - Security.addProvider(new JSSEProvider()); - System.setProperty("java.protocol.handler.pkgs", "com.ibm.net.ssl.internal.www.protocol"); - } public WebServicesParserExt() { super(); |