SSL Connector on newer Jetty requires setKeystorePassword instead of …

…setPassword
JumpMind · Feb 25, 2010 · 4a46bf6 · 4a46bf6
1 parent 24d9f22
commit 4a46bf6
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 1 deletion.
diff --git a/symmetric/src/main/java/org/jumpmind/symmetric/SymmetricWebServer.java b/symmetric/src/main/java/org/jumpmind/symmetric/SymmetricWebServer.java
@@ -232,7 +232,7 @@ protected Connector[] getConnectors(int port, int securePort, Mode mode) {
             String keyStorePassword = System.getProperty(SecurityConstants.SYSPROP_KEYSTORE_PASSWORD);
             keyStorePassword = (keyStorePassword != null) ? keyStorePassword : SecurityConstants.KEYSTORE_PASSWORD;
             ((SslSocketConnector) connector).setKeystore(keyStoreFile);
-            ((SslSocketConnector) connector).setPassword(keyStorePassword);
+            ((SslSocketConnector) connector).setKeyPassword(keyStorePassword);
             ((SslSocketConnector) connector).setMaxIdleTime(maxIdleTime);
             connector.setPort(securePort);
             connector.setHost(host);

diff --git a/symmetric/src/shortcuts/Sample 7 -Start Root Server Secure.launch b/symmetric/src/shortcuts/Sample 7 -Start Root Server Secure.launch
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/symmetric/src/main/java/org/jumpmind/symmetric/SymmetricLauncher.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
+<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
+<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
+<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jumpmind.symmetric.SymmetricLauncher"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-p root.properties --secure-port 8443 --secure-server"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="symmetric"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Duser.language=en -Dsym.keystore.file=../security/keystore -Djavax.net.ssl.trustStore=../security/cacerts -Dsun.net.client.defaultReadTimeout=1800000 -Dsun.net.client.defaultConnectTimeout=1800000"/>
+<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:symmetric/src/main/deploy/samples}"/>
+</launchConfiguration>
diff --git a/symmetric/src/shortcuts/Sample 7 -Start Root Server.launch b/symmetric/src/shortcuts/Sample 7 -Start Root Server.launch
@@ -14,5 +14,6 @@
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jumpmind.symmetric.SymmetricLauncher"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-p root.properties --port 8080 --server"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="symmetric"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Duser.language=en -Dsym.keystore.file=../security/keystore -Djavax.net.ssl.trustStore=../security/cacerts -Dsun.net.client.defaultReadTimeout=1800000 -Dsun.net.client.defaultConnectTimeout=1800000"/>
 <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:symmetric/src/main/deploy/samples}"/>
 </launchConfiguration>