added an implementation of stomp+ssl along with a test case (which doesn't quite work yet but is excluded from the pom.xml :) for AMQ-998

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@467079 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
James Strachan 2006-10-23 18:51:21 +00:00
parent e73f5aabf6
commit 0c6165f4bb
5 changed files with 96 additions and 24 deletions

View File

@ -127,28 +127,6 @@
<artifactId>jmdns</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>activemq</groupId>
<artifactId>smack</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>activemq</groupId>
<artifactId>smackx</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>stax</groupId>
<artifactId>stax</artifactId>
<scope>runtime</scope>
<optional>true</optional>
<exclusions>
<exclusion>
<groupId>xmlbeans</groupId>
<artifactId>xmlbeans-jsr173-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
@ -271,6 +249,9 @@
<!-- see http://issues.apache.org/activemq/browse/AMQ-826 -->
<!-- have not yet figured out the way to configure ApacheDS via Spring -->
<exclude>**/LDAPAuthorizationMapTest.*</exclude>
<!-- TODO need to get the JUnit test configured to create SSL sockets nicely via system properties -->
<exclude>**/StompSslTest.*</exclude>
</excludes>
</configuration>
</plugin>

View File

@ -0,0 +1,42 @@
/**
*
* 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.transport.stomp;
import org.apache.activemq.transport.tcp.TcpTransportFactory;
import org.apache.activemq.transport.tcp.SslTransportFactory;
import org.apache.activemq.transport.Transport;
import org.apache.activemq.wireformat.WireFormat;
import java.util.Map;
/**
* A <a href="http://stomp.codehaus.org/">STOMP</a> over SSL transport factory
*
* @version $Revision$
*/
public class StompSslTransportFactory extends SslTransportFactory {
protected String getDefaultWireFormatType() {
return "stomp";
}
public Transport compositeConfigure(Transport transport, WireFormat format, Map options) {
transport = new StompTransportFilter(transport, new LegacyFrameTranslator());
return super.compositeConfigure(transport, format, options);
}
}

View File

@ -0,0 +1 @@
class=org.apache.activemq.transport.stomp.StompSslTransportFactory

View File

@ -0,0 +1,43 @@
/**
*
* 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.transport.stomp;
import org.apache.activemq.transport.tcp.SslSocketHelper;
import javax.net.ssl.SSLSocketFactory;
import javax.net.ssl.SSLSocket;
import javax.net.SocketFactory;
import java.net.Socket;
import java.net.URI;
import java.io.IOException;
/**
* @version $Revision$
*/
public class StompSslTest extends StompTest {
protected void setUp() throws Exception {
bindAddress = "stomp+ssl://localhost:0";
super.setUp();
}
protected Socket createSocket(URI connectUri) throws IOException {
SocketFactory factory = SSLSocketFactory.getDefault();
return factory.createSocket("127.0.0.1", connectUri.getPort());
}
}

View File

@ -46,16 +46,17 @@ public class StompTest extends CombinationTestSupport {
private Connection connection;
private Session session;
private ActiveMQQueue queue;
protected String bindAddress = "stomp://localhost:0";
protected void setUp() throws Exception {
broker = new BrokerService();
broker.setPersistent(false);
connector = broker.addConnector("stomp://localhost:0");
connector = broker.addConnector(bindAddress);
broker.start();
URI connectUri = connector.getConnectUri();
stompSocket = new Socket("127.0.0.1", connectUri.getPort());
stompSocket = createSocket(connectUri);
inputBuffer = new ByteArrayOutputStream();
ActiveMQConnectionFactory cf = new ActiveMQConnectionFactory("vm://localhost");
@ -67,6 +68,10 @@ public class StompTest extends CombinationTestSupport {
}
protected Socket createSocket(URI connectUri) throws IOException {
return new Socket("127.0.0.1", connectUri.getPort());
}
protected String getQueueName() {
return getClass().getName() + "." + getName();
}