Author: reto
Date: Thu Aug 12 13:40:12 2010
New Revision: 984769
URL: http://svn.apache.org/viewvc?rev=984769&view=rev
Log:
CLEREZZA-273: applied patch Henry Story
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.launcher.storageless.parent/org.apache.clerezza.platform.launcher.storageless/src/main/java/org/apache/clerezza/platform/launcher/Main.java
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.launcher.storageless.parent/org.apache.clerezza.platform.launcher.storageless/src/main/java/org/apache/clerezza/platform/launcher/Main.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.launcher.storageless.parent/org.apache.clerezza.platform.launcher.storageless/src/main/java/org/apache/clerezza/platform/launcher/Main.java?rev=984769&r1=984768&r2=984769&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.launcher.storageless.parent/org.apache.clerezza.platform.launcher.storageless/src/main/java/org/apache/clerezza/platform/launcher/Main.java
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.launcher.storageless.parent/org.apache.clerezza.platform.launcher.storageless/src/main/java/org/apache/clerezza/platform/launcher/Main.java
Thu Aug 12 13:40:12 2010
@@ -287,7 +287,7 @@ public class Main implements BundleActiv
}
{
- final String keyStorePassword =
arguments.getKeyStorePath();
+ final String keyStorePassword =
arguments.getKeyStorePassword();
if (keyStorePassword != null) {
configProps.put("org.wymiwyg.jetty.httpservice.https.keystore.password",
keyStorePassword);
httpsEnabled = true;