airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ami...@apache.org
Subject svn commit: r1434939 - in /airavata/trunk/modules: commons/utils/src/main/java/org/apache/airavata/common/utils/SecurityUtil.java distribution/xbaya-gui/src/main/resources/xbaya.jnlp
Date Thu, 17 Jan 2013 22:25:57 GMT
Author: amilaj
Date: Thu Jan 17 22:25:57 2013
New Revision: 1434939

URL: http://svn.apache.org/viewvc?rev=1434939&view=rev
Log:
Fixing ssl issues related to jnlp

Modified:
    airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/SecurityUtil.java
    airavata/trunk/modules/distribution/xbaya-gui/src/main/resources/xbaya.jnlp

Modified: airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/SecurityUtil.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/SecurityUtil.java?rev=1434939&r1=1434938&r2=1434939&view=diff
==============================================================================
--- airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/SecurityUtil.java
(original)
+++ airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/SecurityUtil.java
Thu Jan 17 22:25:57 2013
@@ -40,10 +40,14 @@ public class SecurityUtil {
      */
     public static void setTrustStoreParameters(String trustStoreFilePath, String trustStorePassword)
{
 
-        logger.info("Setting Java trust store to " + trustStoreFilePath);
+        if (System.getProperty("javax.net.ssl.trustStrore") == null) {
+            logger.info("Setting Java trust store to " + trustStoreFilePath);
+            System.setProperty("javax.net.ssl.trustStrore", trustStoreFilePath);
+        }
 
-        System.setProperty("javax.net.ssl.trustStrore", trustStoreFilePath);
-        System.setProperty("javax.net.ssl.trustStorePassword", trustStorePassword);
+        if (System.getProperty("javax.net.ssl.trustStorePassword") == null) {
+            System.setProperty("javax.net.ssl.trustStorePassword", trustStoreFilePath);
+        }
 
     }
 }

Modified: airavata/trunk/modules/distribution/xbaya-gui/src/main/resources/xbaya.jnlp
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/xbaya-gui/src/main/resources/xbaya.jnlp?rev=1434939&r1=1434938&r2=1434939&view=diff
==============================================================================
--- airavata/trunk/modules/distribution/xbaya-gui/src/main/resources/xbaya.jnlp (original)
+++ airavata/trunk/modules/distribution/xbaya-gui/src/main/resources/xbaya.jnlp Thu Jan 17
22:25:57 2013
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <jnlp spec="1.0+"
-   codebase="http://localhost/airavata-xbaya/"
+   codebase="http://localhost:8080/airavata-xbaya/"
    href="xbaya.jnlp">
 <information>
 	<title>XBaya</title>
@@ -17,6 +17,11 @@
 	    DEPENDENT_JARS
 
     <property name="log" value="org.apache.airavata.xbaya:ALL"/>
+    <!--property name="javax.net.ssl.trustStore" value="client.jks"/>
+    <property name="javax.net.ssl.trustStorePassword" value="airavata"/>
+    <property name="javax.net.ssl.trustStoreType" value="JKS"/>
+    <property name="javax.net.ssl.keyStore" value="client.jks"/>
+    <property name="javax.net.ssl.keyStorePassword" value="airavata"/-->
 </resources>
 <application-desc main-class="org.apache.airavata.xbaya.XBaya">
 



Mime
View raw message