DPML Notify

[mcconnell at BerliOS <mcconnell AT mail.berlios.de>]

Author: mcconnell
Date: 2006-02-01 20:15:01 +0100 (Wed, 01 Feb 2006)
New Revision: 1010

Modified:
   
trunk/main/planet/web/server/src/main/net/dpml/web/server/SslSocketConnector.java
Log:
move debug traces to the jetty logging framework (SSL issue seems to be with 
bundled keystore)

Modified: 
trunk/main/planet/web/server/src/main/net/dpml/web/server/SslSocketConnector.java
===================================================================
--- 
trunk/main/planet/web/server/src/main/net/dpml/web/server/SslSocketConnector.java
   2006-02-01 18:05:34 UTC (rev 1009)
+++ 
trunk/main/planet/web/server/src/main/net/dpml/web/server/SslSocketConnector.java
   2006-02-01 19:15:01 UTC (rev 1010)
@@ -21,6 +21,8 @@
 
 import net.dpml.transit.util.PropertyResolver;
 
+import org.mortbay.log.Log;
+
 /**
  * SSL socket connector with enhanced keystore resolution semantics.
  */
@@ -38,13 +40,25 @@
     public void setKeystore( String keystore )
     {
         String resolved = PropertyResolver.resolve( keystore );
+        Log.info( "# resolved keystore argument: [" + resolved + "]" );
         if( resolved.startsWith( "local:" ) )
         {
+            Log.info( "# argument is a local value" );
             try
             {
                 URI uri = new URI( resolved );
                 File file = (File) uri.toURL().getContent( new Class[]{ 
File.class } );
-                super.setKeystore( file.getCanonicalPath() );
+                if( !file.exists() )
+                {
+                    final String error = 
+                      "Keystore file ["
+                      + file
+                      + "] does not exist.";
+                    throw new IllegalArgumentException( error );
+                }
+                String path = file.getCanonicalPath();
+                Log.info( "# validated keystore exists\npath: " + path );
+                super.setKeystore( path );
             }
             catch( Exception e )
             {
@@ -55,6 +69,7 @@
         }
         else
         {
+            Log.info( "# keystore location: " + resolved );
             super.setKeystore( resolved );
         }
     }