Apache/activemq
1
0
Fork 0
mirror of https://github.com/apache/activemq.git synced 2025-02-08 19:15:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

https://issues.apache.org/jira/browse/AMQ-3980 - generic support for all web socket tuning options

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1378035 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Bosanac Dejan 2012-08-28 09:24:53 +00:00
parent 53f07b0a75
commit 9b0316b9b4
5 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
activemq-optional/src/main/java/org/apache/activemq/transport/SocketConnectorFactory.java
View File

@ -16,6 +16,7 @@
*/ */
package org.apache.activemq.transport; package org.apache.activemq.transport;
import org.apache.activemq.util.IntrospectionSupport;
import org.eclipse.jetty.server.Connector; import org.eclipse.jetty.server.Connector;
import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.nio.SelectChannelConnector; import org.eclipse.jetty.server.nio.SelectChannelConnector;
@ -27,7 +28,9 @@ public class SocketConnectorFactory {
private Map<String, Object> transportOptions; private Map<String, Object> transportOptions;
public Connector createConnector() throws Exception { public Connector createConnector() throws Exception {
return new SelectChannelConnector(); SelectChannelConnector connector = new SelectChannelConnector();
IntrospectionSupport.setProperties(connector, transportOptions, "");
return connector;
} }
public Map<String, Object> getTransportOptions() { public Map<String, Object> getTransportOptions() {

3
activemq-optional/src/main/java/org/apache/activemq/transport/ws/WSTransportFactory.java
View File

@ -28,7 +28,6 @@ import org.apache.activemq.transport.TransportServer;
import org.apache.activemq.util.IOExceptionSupport; import org.apache.activemq.util.IOExceptionSupport;
import org.apache.activemq.util.IntrospectionSupport; import org.apache.activemq.util.IntrospectionSupport;
import org.apache.activemq.util.URISupport; import org.apache.activemq.util.URISupport;
/** /**
* *
* Factory for WebSocket (ws) transport * Factory for WebSocket (ws) transport
@ -40,7 +39,7 @@ public class WSTransportFactory extends TransportFactory {
try { try {
Map<String, String> options = new HashMap<String, String>(URISupport.parseParameters(location)); Map<String, String> options = new HashMap<String, String>(URISupport.parseParameters(location));
WSTransportServer result = new WSTransportServer(location); WSTransportServer result = new WSTransportServer(location);
Map<String, Object> transportOptions = IntrospectionSupport.extractProperties(options, "transport."); Map<String, Object> transportOptions = IntrospectionSupport.extractProperties(options, "");
result.setTransportOption(transportOptions); result.setTransportOption(transportOptions);
return result; return result;
} catch (URISyntaxException e) { } catch (URISyntaxException e) {

22
activemq-optional/src/main/java/org/apache/activemq/transport/ws/WSTransportServer.java
View File

@ -41,8 +41,6 @@ import java.util.Map;
*/ */
public class WSTransportServer extends WebTransportServerSupport { public class WSTransportServer extends WebTransportServerSupport {
int maxTextMessageSize = -1;
public WSTransportServer(URI location) { public WSTransportServer(URI location) {
super(location); super(location);
this.bindAddress = location; this.bindAddress = location;
@ -64,9 +62,14 @@ public class WSTransportServer extends WebTransportServerSupport {
new ServletContextHandler(server, "/", ServletContextHandler.NO_SECURITY); new ServletContextHandler(server, "/", ServletContextHandler.NO_SECURITY);
ServletHolder holder = new ServletHolder(); ServletHolder holder = new ServletHolder();
if (maxTextMessageSize != -1) { Map<String, Object> webSocketOptions = IntrospectionSupport.extractProperties(transportOptions, "websocket.");
holder.setInitParameter("maxTextMessageSize", String.valueOf(maxTextMessageSize)); for(Map.Entry<String,Object> webSocketEntry : webSocketOptions.entrySet()) {
Object value = webSocketEntry.getValue();
if (value != null) {
holder.setInitParameter(webSocketEntry.getKey(), value.toString());
} }
}
holder.setServlet(new StompServlet()); holder.setServlet(new StompServlet());
contextHandler.addServlet(holder, "/"); contextHandler.addServlet(holder, "/");
@ -97,16 +100,9 @@ public class WSTransportServer extends WebTransportServerSupport {
@Override @Override
public void setTransportOption(Map<String, Object> transportOptions) { public void setTransportOption(Map<String, Object> transportOptions) {
IntrospectionSupport.setProperties(this, transportOptions); Map<String, Object> socketOptions = IntrospectionSupport.extractProperties(transportOptions, "transport.");
socketConnectorFactory.setTransportOptions(transportOptions); socketConnectorFactory.setTransportOptions(socketOptions);
super.setTransportOption(transportOptions); super.setTransportOption(transportOptions);
} }
public int getMaxTextMessageSize() {
return maxTextMessageSize;
}
public void setMaxTextMessageSize(int maxTextMessageSize) {
this.maxTextMessageSize = maxTextMessageSize;
}
} }

2
activemq-optional/src/main/java/org/apache/activemq/transport/wss/WSSTransportFactory.java
View File

@ -41,7 +41,7 @@ public class WSSTransportFactory extends TransportFactory {
try { try {
Map<String, String> options = new HashMap<String, String>(URISupport.parseParameters(location)); Map<String, String> options = new HashMap<String, String>(URISupport.parseParameters(location));
WSSTransportServer result = new WSSTransportServer(location, SslContext.getCurrentSslContext()); WSSTransportServer result = new WSSTransportServer(location, SslContext.getCurrentSslContext());
Map<String, Object> transportOptions = IntrospectionSupport.extractProperties(options, "transport."); Map<String, Object> transportOptions = IntrospectionSupport.extractProperties(options, "");
result.setTransportOption(transportOptions); result.setTransportOption(transportOptions);
return result; return result;
} catch (URISyntaxException e) { } catch (URISyntaxException e) {

2
activemq-optional/src/test/java/org/apache/activemq/transport/ws/WSTransportTest.java
View File

@ -64,7 +64,7 @@ public class WSTransportTest {
new URI("broker:()/localhost?persistent=false&useJmx=false")); new URI("broker:()/localhost?persistent=false&useJmx=false"));
stompUri = broker.addConnector("stomp://localhost:0").getPublishableConnectString(); stompUri = broker.addConnector("stomp://localhost:0").getPublishableConnectString();
wsUri = broker.addConnector("ws://127.0.0.1:61623").getPublishableConnectString(); wsUri = broker.addConnector("ws://127.0.0.1:61623?websocket.maxTextMessageSize=99999&transport.maxIdleTime=1001").getPublishableConnectString();
broker.setDeleteAllMessagesOnStartup(deleteMessages); broker.setDeleteAllMessagesOnStartup(deleteMessages);
broker.start(); broker.start();
broker.waitUntilStarted(); broker.waitUntilStarted();