Author: janstey
Date: Wed Feb 11 17:02:29 2009
New Revision: 743402
URL: http://svn.apache.org/viewvc?rev=743402&view=rev
Log:
CAMEL-1334 - Fixed case of setting ssl keystore via system property
Added:
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsRouteSetupWithSystemPropsTest.java
(with props)
Modified:
camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsRouteTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/SpringHttpsRouteTest.java
Modified:
camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java?rev=743402&r1=743401&r2=743402&view=diff
==============================================================================
---
camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
(original)
+++
camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
Wed Feb 11 17:02:29 2009
@@ -47,6 +47,8 @@
*/
public class JettyHttpComponent extends HttpComponent {
+ private static final String JETTY_SSL_KEYSTORE = "jetty.ssl.keystore";
+
class ConnectorRef {
Connector connector;
CamelServlet servlet;
@@ -229,6 +231,13 @@
sslSocketConnector.setKeyPassword(sslKeyPassword);
if (sslKeystore != null) {
sslSocketConnector.setKeystore(sslKeystore);
+ } else {
+ // try the keystore system property as a backup, jetty doesn't
seem
+ // to read this property anymore
+ String keystoreProperty =
System.getProperty(JETTY_SSL_KEYSTORE);
+ if (keystoreProperty != null) {
+ sslSocketConnector.setKeystore(keystoreProperty);
+ }
}
}
return sslSocketConnector;
Added:
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsRouteSetupWithSystemPropsTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsRouteSetupWithSystemPropsTest.java?rev=743402&view=auto
==============================================================================
---
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsRouteSetupWithSystemPropsTest.java
(added)
+++
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsRouteSetupWithSystemPropsTest.java
Wed Feb 11 17:02:29 2009
@@ -0,0 +1,58 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.jetty;
+
+import java.net.URL;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+import org.apache.camel.builder.RouteBuilder;
+
+public class HttpsRouteSetupWithSystemPropsTest extends HttpsRouteTest {
+
+ @Override
+ protected void setUp() throws Exception {
+ // ensure jsse clients can validate the self signed dummy localhost
cert,
+ // use the server keystore as the trust store for these tests
+ URL trustStoreUrl =
this.getClass().getClassLoader().getResource("jsse/localhost.ks");
+ setSystemProp("javax.net.ssl.trustStore", trustStoreUrl.getPath());
+
+ // setup SSL using system properties
+ setSystemProp("jetty.ssl.keystore", trustStoreUrl.getPath());
+ setSystemProp("jetty.ssl.keypassword", pwd);
+ setSystemProp("jetty.ssl.password", pwd);
+
+ super.setUp();
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ public void configure() {
+ from("jetty:https://localhost:9080/test").to("mock:a");
+
+ Processor proc = new Processor() {
+ public void process(Exchange exchange) throws Exception {
+ exchange.getOut(true).setBody("<b>Hello World</b>");
+ }
+ };
+ from("jetty:https://localhost:9080/hello").process(proc);
+ }
+ };
+ }
+}
+
Propchange:
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsRouteSetupWithSystemPropsTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsRouteTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsRouteTest.java?rev=743402&r1=743401&r2=743402&view=diff
==============================================================================
---
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsRouteTest.java
(original)
+++
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsRouteTest.java
Wed Feb 11 17:02:29 2009
@@ -55,12 +55,12 @@
super.tearDown();
}
- private void setSystemProp(String key, String value) {
+ protected void setSystemProp(String key, String value) {
String originalValue = System.setProperty(key, value);
originalValues.put(key, originalValue != null ? originalValue :
NULL_VALUE_MARKER);
}
- private void restoreSystemProperties() {
+ protected void restoreSystemProperties() {
for (Object key : originalValues.keySet()) {
Object value = (String) originalValues.get(key);
if (NULL_VALUE_MARKER.equals(value)) {
Modified:
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/SpringHttpsRouteTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/SpringHttpsRouteTest.java?rev=743402&r1=743401&r2=743402&view=diff
==============================================================================
---
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/SpringHttpsRouteTest.java
(original)
+++
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/SpringHttpsRouteTest.java
Wed Feb 11 17:02:29 2009
@@ -16,27 +16,20 @@
*/
package org.apache.camel.component.jetty;
-import static
org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
-
-import java.io.ByteArrayOutputStream;
import java.io.IOException;
-import java.io.InputStream;
-import java.net.SocketException;
import java.net.URL;
import java.util.List;
import java.util.Map;
import java.util.Properties;
import org.apache.camel.CamelContext;
-import org.apache.camel.Component;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
-import org.apache.camel.Processor;
import org.apache.camel.RuntimeCamelException;
-import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import static
org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
public class SpringHttpsRouteTest extends ContextTestSupport {
private static final String NULL_VALUE_MARKER =
ContextTestSupport.class.getCanonicalName();