httpunit-commit Mailing List for httpunit (Page 80)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/httpunit/httpunit/src/com/meterware/httpunit
In directory slayer.i.sourceforge.net:/tmp/cvs-serv619/src/com/meterware/httpunit

Modified Files:
	WebRequest.java 
Log Message:
Correct https support

Index: WebRequest.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/src/com/meterware/httpunit/WebRequest.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7

--- WebRequest.java	2000/09/28 18:27:39	1.6
+++ WebRequest.java	2000/10/02 16:31:36	1.7
@@ -70,12 +70,20 @@
      * Returns the final URL associated with this web request.
      **/
     public URL getURL() throws MalformedURLException {
-        if (getURLBase() == null) validateProtocol( getURLString() );
+        if (getURLBase() == null || getURLString().indexOf( ':' ) > 0) validateProtocol( getURLString() );
         return new URL( getURLBase(), getURLString() );
     }
 
 
+    /**
+     * Returns the target for this web request.
+     **/
+    public String getTarget() {
+        return _target;
+    }
+
 
+
 //------------------------------------- protected members ------------------------------------
 
 
@@ -91,17 +99,34 @@
      * Constructs a web request using a base URL and a relative URL string.
      **/
     protected WebRequest( URL urlBase, String urlString ) {
-        this( urlBase, urlString, null );
+        this( urlBase, urlString, (WebForm) null );
     }
 
 
     /**
+     * Constructs a web request using a base URL, a relative URL string, and a target.
+     **/
+    protected WebRequest( URL urlBase, String urlString, String target ) {
+        this( urlBase, urlString, target, null );
+    }
+
+
+    /**
      * Constructs a web request using a base URL and a relative URL string.
      **/
     protected WebRequest( URL urlBase, String urlString, WebForm sourceForm ) {
+        this( urlBase, urlString, TOP_FRAME, sourceForm );
+    }
+    
+
+    /**
+     * Constructs a web request using a base URL and a relative URL string.
+     **/
+    protected WebRequest( URL urlBase, String urlString, String target, WebForm sourceForm ) {
         _urlBase   = urlBase;
         _urlString = urlString;
         _sourceForm = sourceForm;
+        _target     = target;
     }
     
 
@@ -109,7 +134,7 @@
      * Constructs a web request using a base request and a relative URL string.
      **/
     protected WebRequest( WebRequest baseRequest, String urlString ) throws MalformedURLException {
-        this( baseRequest.getURL(), urlString, null );
+        this( baseRequest.getURL(), urlString, (WebForm) null );
     }
     
 
@@ -153,14 +178,29 @@
     }
 
     
+//---------------------------------- package members --------------------------------
+
+    /** The name of the topmost frame. **/
+    final static String TOP_FRAME = "_top";
+
+
 //--------------------------------------- private members ------------------------------------
+
+    /** The name of the system parameter used by java.net to locate protocol handlers. **/
+    private final static String PROTOCOL_HANDLER_PKGS  = "java.protocol.handler.pkgs";
+
+    /** The name of the JSSE class which provides support for SSL. **/
+    private final static String SunJSSE_PROVIDER_CLASS = "com.sun.net.ssl.internal.ssl.Provider";
+
+    /** The name of the JSSE class which supports the https protocol. **/
+    private final static String SSL_PROTOCOL_HANDLER   = "com.sun.net.ssl.internal.www.protocol";
 
-    private final static String PROTOCOL_HANDLER_PKGS = "java.protocol.handler.pkgs";
 
     private URL       _urlBase;
     private String    _urlString;
     private Hashtable _parameters = new Hashtable();
     private WebForm   _sourceForm;
+    private String    _target = TOP_FRAME;
 
     private boolean   _httpsProtocolSupportEnabled;
 
@@ -233,32 +273,24 @@
     }
 
 
-    private static boolean hasSSLProvider() {
+    private static boolean hasProvider( Class providerClass ) {
         Provider[] list = Security.getProviders();
         for (int i = 0; i < list.length; i++) {
-            if (list[i].getClass().getName().equals( SunJSSE_PROVIDER_CLASS )) return true;
+            if (list[i].getClass().equals( providerClass )) return true;
         }
         return false;
     }
 
-    private static String SunJSSE_PROVIDER_CLASS = "com.sun.net.ssl.internal.ssl.Provider";
-    private static RuntimeException _httpsProblem;
-
-
-    static void verifyHttpsSupport() {
+    private static void verifyHttpsSupport() {
         if (System.getProperty( "java.version" ).startsWith( "1.1" )) {
             throw new RuntimeException( "https support requires Java 2" );
-        } else if (System.getProperty( PROTOCOL_HANDLER_PKGS ) == null) {
+        } else {
             try {
-                Class.forName( "com.sun.net.ssl.HttpsURLConnection" );
-                Method setMethod = System.class.getMethod( "setProperty", new Class[] { String.class, String.class } );
-                setMethod.invoke( null, new String[] { PROTOCOL_HANDLER_PKGS, "com.sun.net.ssl.internal.www.protocol" } );
-                if (!hasSSLProvider()) {
-                    throw new RuntimeException( "https support not enabled. Please edit <java-home>/lib/security/java.security to add the line: " +
-                                                "security.provider.2=com.sun.net.ssl.internal.ssl.Provider" );
-                }
+                Class providerClass = Class.forName( SunJSSE_PROVIDER_CLASS );
+                if (!hasProvider( providerClass )) Security.addProvider( (Provider) providerClass.newInstance() );
+                registerSSLProtocolHandler();
             } catch (ClassNotFoundException e) {
-                throw new RuntimeException( "https support requires the Java Secure Sockets Extension. See http://java.sun.com/products/jsse/install.html" );
+                throw new RuntimeException( "https support requires the Java Secure Sockets Extension. See http://java.sun.com/products/jsse" );
             } catch (Throwable e) {
                 throw new RuntimeException( "Unable to enable https support. Make sure that you have installed JSSE " +
                                             "as described in http://java.sun.com/products/jsse/install.html: " + e );
@@ -267,18 +299,18 @@
     }
 
 
-    // this does not work for some reason
-    static void unusedSetProviderDynamically() throws ClassNotFoundException, InstantiationException, IllegalAccessException { 
-        Security.addProvider( (Provider) Class.forName( SunJSSE_PROVIDER_CLASS ).newInstance() );
+    private static void registerSSLProtocolHandler() throws NoSuchMethodException, InvocationTargetException, IllegalAccessException { 
+        String list = System.getProperty( PROTOCOL_HANDLER_PKGS );
+        Method setMethod = System.class.getMethod( "setProperty", new Class[] { String.class, String.class } );
+        if (list == null || list.length() == 0) {
+            setMethod.invoke( null, new String[] { PROTOCOL_HANDLER_PKGS, SSL_PROTOCOL_HANDLER } );
+        } else if (list.indexOf( SSL_PROTOCOL_HANDLER ) < 0) {
+            setMethod.invoke( null, new String[] { PROTOCOL_HANDLER_PKGS, SSL_PROTOCOL_HANDLER + " | " + list } );
+        }    
     }
 
 
 }
-
-
-
-
-
 
 
 //================================ exception class NoSuchParameterException =========================================




2000	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug (5)	Sep (31)	Oct (39)	Nov (18)	Dec (6)
2001	Jan (8)	Feb (5)	Mar (8)	Apr (25)	May (20)	Jun (23)	Jul (28)	Aug (10)	Sep (3)	Oct (32)	Nov (61)	Dec (24)
2002	Jan (50)	Feb (34)	Mar (35)	Apr (3)	May (25)	Jun (25)	Jul (30)	Aug (146)	Sep (49)	Oct (156)	Nov (121)	Dec (54)
2003	Jan (12)	Feb (79)	Mar (88)	Apr (26)	May (67)	Jun (29)	Jul (8)	Aug (16)	Sep (20)	Oct (17)	Nov	Dec (5)
2004	Jan	Feb (40)	Mar (30)	Apr (5)	May	Jun (83)	Jul (34)	Aug (20)	Sep (44)	Oct (46)	Nov	Dec (14)
2005	Jan (4)	Feb	Mar (5)	Apr	May	Jun	Jul	Aug	Sep (4)	Oct	Nov	Dec (1)
2006	Jan	Feb	Mar (26)	Apr (8)	May (2)	Jun	Jul	Aug	Sep	Oct (5)	Nov	Dec
2008	Jan	Feb	Mar	Apr (36)	May (38)	Jun (1)	Jul (1)	Aug	Sep (4)	Oct	Nov (18)	Dec (4)
2009	Jan	Feb (2)	Mar (3)	Apr	May	Jun (2)	Jul	Aug (35)	Sep (1)	Oct	Nov	Dec (1)
2010	Jan	Feb	Mar	Apr	May (3)	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2011	Jan (9)	Feb	Mar	Apr (1)	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec (1)
2012	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep (21)	Oct (18)	Nov (1)	Dec

httpunit-commit Mailing List for httpunit (Page 80)

httpunit-commit — CVS commit logs