You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ta...@apache.org on 2012/05/04 14:23:41 UTC
svn commit: r1333905 - in /activemq/trunk/activemq-core/src:
main/java/org/apache/activemq/spring/ test/java/org/apache/activemq/security/
test/resources/org/apache/activemq/security/
Author: tabish
Date: Fri May 4 12:23:41 2012
New Revision: 1333905
URL: http://svn.apache.org/viewvc?rev=1333905&view=rev
Log:
apply patch for: https://issues.apache.org/jira/browse/AMQ-3822
Added:
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/security/XBeanSslContextTest.java (with props)
activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/activemq-sslcontext.xml (with props)
activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/sslcontext-client.ts (with props)
activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/sslcontext-keystore.ks (with props)
Modified:
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/spring/SpringSslContext.java
Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/spring/SpringSslContext.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/spring/SpringSslContext.java?rev=1333905&r1=1333904&r2=1333905&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/spring/SpringSslContext.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/spring/SpringSslContext.java Fri May 4 12:23:41 2012
@@ -51,6 +51,7 @@ public class SpringSslContext extends Ss
private String keyStore;
private String trustStore;
+ private String keyStoreKeyPassword;
private String keyStorePassword;
private String trustStorePassword;
@@ -90,7 +91,7 @@ public class SpringSslContext extends Ss
}
KeyManagerFactory tmf = KeyManagerFactory.getInstance(keyStoreAlgorithm);
- tmf.init(ks, keyStorePassword==null? null : keyStorePassword.toCharArray());
+ tmf.init(ks, keyStoreKeyPassword == null ? (keyStorePassword==null? null : keyStorePassword.toCharArray()) : keyStoreKeyPassword.toCharArray());
return Arrays.asList(tmf.getKeyManagers());
}
@@ -164,6 +165,14 @@ public class SpringSslContext extends Ss
this.trustStoreAlgorithm = trustAlgorithm;
}
+ public String getKeyStoreKeyPassword() {
+ return keyStoreKeyPassword;
+ }
+
+ public void setKeyStoreKeyPassword(String keyPassword) {
+ this.keyStoreKeyPassword = keyPassword;
+ }
+
public String getKeyStorePassword() {
return keyStorePassword;
}
Added: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/security/XBeanSslContextTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/security/XBeanSslContextTest.java?rev=1333905&view=auto
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/security/XBeanSslContextTest.java (added)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/security/XBeanSslContextTest.java Fri May 4 12:23:41 2012
@@ -0,0 +1,41 @@
+/**
+ * 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.activemq.security;
+
+import java.net.URI;
+
+import org.apache.activemq.broker.BrokerFactory;
+import org.apache.activemq.broker.BrokerService;
+import org.junit.After;
+import org.junit.Test;
+
+public class XBeanSslContextTest {
+
+ BrokerService broker;
+
+ @Test
+ public void testSslContextElement() throws Exception {
+ broker = BrokerFactory.createBroker(new URI("xbean:org/apache/activemq/security/activemq-sslcontext.xml"));
+ }
+
+ @After
+ public void stopBroker() throws Exception {
+ if (broker != null)
+ broker.stop();
+ }
+
+}
Propchange: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/security/XBeanSslContextTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/activemq-sslcontext.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/activemq-sslcontext.xml?rev=1333905&view=auto
==============================================================================
--- activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/activemq-sslcontext.xml (added)
+++ activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/activemq-sslcontext.xml Fri May 4 12:23:41 2012
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<!-- START SNIPPET: xbean -->
+<beans
+ xmlns="http://www.springframework.org/schema/beans"
+ xmlns:amq="http://activemq.apache.org/schema/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+ http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd">
+
+ <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+
+ <broker useJmx="false" xmlns="http://activemq.apache.org/schema/core" persistent="false">
+
+ <sslContext>
+ <sslContext keyStore="org/apache/activemq/security/sslcontext-keystore.ks"
+ keyStorePassword="passwordone"
+ keyStoreKeyPassword="passwordtwo"
+ trustStore="org/apache/activemq/security/sslcontext-client.ts"
+ trustStorePassword="passwordone"/>
+ </sslContext>
+
+ <transportConnectors>
+ <transportConnector uri="ssl://localhost:61616" />
+ </transportConnectors>
+
+ </broker>
+
+</beans>
+<!-- END SNIPPET: xbean -->
Propchange: activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/activemq-sslcontext.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/sslcontext-client.ts
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/sslcontext-client.ts?rev=1333905&view=auto
==============================================================================
Binary file - no diff available.
Propchange: activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/sslcontext-client.ts
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/sslcontext-keystore.ks
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/sslcontext-keystore.ks?rev=1333905&view=auto
==============================================================================
Binary file - no diff available.
Propchange: activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/sslcontext-keystore.ks
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream