svn commit: r529429 - /ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java

[jaz-3]

Author: jaz
Date: Mon Apr 16 15:49:57 2007
New Revision: 529429

URL: http://svn.apache.org/viewvc?view=rev&rev=529429
Log:
now loads the JSSE settings before starting catalina; this way tomcat uses our truststore instead of the default java truststore

Modified:
    ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java

Modified: ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java?view=diff&rev=529429&r1=529428&r2=529429
==============================================================================
--- ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java (original)
+++ ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java Mon Apr 16 15:49:57 2007
@@ -35,10 +35,7 @@
 import org.ofbiz.base.container.Container;
 import org.ofbiz.base.container.ContainerConfig;
 import org.ofbiz.base.container.ContainerException;
-import org.ofbiz.base.util.Debug;
-import org.ofbiz.base.util.UtilURL;
-import org.ofbiz.base.util.UtilValidate;
-import org.ofbiz.base.util.UtilXml;
+import org.ofbiz.base.util.*;
 import org.ofbiz.entity.GenericDelegator;
 
 import org.apache.catalina.Cluster;
@@ -130,6 +127,11 @@
     public static final String J2EE_APP = "OFBiz";
     public static final String module = CatalinaContainer.class.getName();
     protected static Map mimeTypes = new HashMap();
+
+    // load the JSSE propertes (set the trust store)
+    static {
+        SSLUtil.loadJsseProperties();
+    }
 
     protected GenericDelegator delegator = null;
     protected Embedded embedded = null;