You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2011/10/05 18:14:33 UTC
svn commit: r1179293 - in /qpid/branches/rg-amqp-1-0-sandbox/qpid/java:
amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/
amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/framing/
amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_...
Author: rgodfrey
Date: Wed Oct 5 16:14:32 2011
New Revision: 1179293
URL: http://svn.apache.org/viewvc?rev=1179293&view=rev
Log:
NO-JIRA: AMQP 1.0 Updates for demo
Modified:
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Connection.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Demo.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Receiver.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Sender.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Session.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Util.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/framing/SASLFrameHandler.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/ConnectionEndpoint.java
Modified: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Connection.java
URL: http://svn.apache.org/viewvc/qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Connection.java?rev=1179293&r1=1179292&r2=1179293&view=diff
==============================================================================
--- qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Connection.java (original)
+++ qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Connection.java Wed Oct 5 16:14:32 2011
@@ -30,6 +30,8 @@ import org.apache.qpid.amqp_1_0.type.Fra
import org.apache.qpid.amqp_1_0.type.SaslFrameBody;
import org.apache.qpid.amqp_1_0.type.UnsignedInteger;
+import javax.net.ssl.SSLSocket;
+import javax.net.ssl.SSLSocketFactory;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
@@ -56,6 +58,15 @@ public class Connection
{
this(address, port, username, password, MAX_FRAME_SIZE);
}
+
+ public Connection(final String address,
+ final int port,
+ final String username,
+ final String password, String remoteHostname) throws ConnectionException
+ {
+ this(address, port, username, password, MAX_FRAME_SIZE,new Container(),remoteHostname);
+ }
+
public Connection(final String address,
final int port,
final String username,
@@ -74,20 +85,48 @@ public class Connection
this(address,port,username,password,MAX_FRAME_SIZE,container);
}
+ public Connection(final String address,
+ final int port,
+ final String username,
+ final String password,
+ final int maxFrameSize,
+ final Container container) throws ConnectionException
+ {
+ this(address,port,username,password,maxFrameSize,container, null);
+ }
public Connection(final String address,
final int port,
final String username,
final String password,
final int maxFrameSize,
- final Container container) throws ConnectionException
+ final Container container,
+ final String remoteHostname) throws ConnectionException
+ {
+ this(address,port,username,password,maxFrameSize,container,remoteHostname,false);
+ }
+ public Connection(final String address,
+ final int port,
+ final String username,
+ final String password,
+ final int maxFrameSize,
+ final Container container,
+ final String remoteHostname, boolean ssl) throws ConnectionException
{
_address = address;
try
{
- final Socket s = new Socket(address, port);
+ final Socket s;
+ if(ssl)
+ {
+ s = SSLSocketFactory.getDefault().createSocket(address, port);
+ }
+ else
+ {
+ s = new Socket(address, port);
+ }
Principal principal = username == null ? null : new Principal()
@@ -101,6 +140,7 @@ public class Connection
_conn = new ConnectionEndpoint(container, principal, password);
_conn.setDesiredMaxFrameSize(UnsignedInteger.valueOf(maxFrameSize));
_conn.setRemoteAddress(s.getRemoteSocketAddress());
+ _conn.setRemoteHostname(remoteHostname);
Modified: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Demo.java
URL: http://svn.apache.org/viewvc/qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Demo.java?rev=1179293&r1=1179292&r2=1179293&view=diff
==============================================================================
--- qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Demo.java (original)
+++ qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Demo.java Wed Oct 5 16:14:32 2011
@@ -40,7 +40,7 @@ import java.util.Map;
public class Demo extends Util
{
- private static final String USAGE_STRING = "demo [options] <address> [<content> ...]\n\nOptions:";
+ private static final String USAGE_STRING = "demo [options] <vendor> [<content> ...]\n\nOptions:";
private static final String OPCODE = "opcode";
private static final String ACTION = "action";
private static final String MESSAGE_ID = "message-id";
@@ -60,6 +60,8 @@ public class Demo extends Util
private static final String SENDER = "sender";
private static final String SEND_MESSAGE = "send-message";
private static final String ANNOUNCE = "announce";
+ private static final String MESSAGE_VENDOR = "message-vendor";
+ private static final String CREATE_LINK = "create-link";
public static void main(String[] args)
{
@@ -137,7 +139,7 @@ public class Demo extends Util
try
{
-
+ final String vendor = getArgs()[0];
final String queue = "control";
String message = "";
@@ -168,7 +170,7 @@ public class Demo extends Util
ApplicationProperties appProperties = new ApplicationProperties(appPropMap);
appPropMap.put(OPCODE, ANNOUNCE);
- appPropMap.put(VENDOR, APACHE);
+ appPropMap.put(VENDOR, vendor);
appPropMap.put(ADDRESS,responseReceiver.getAddress());
AmqpValue amqpValue = new AmqpValue(message);
@@ -194,33 +196,97 @@ public class Demo extends Util
ApplicationProperties props = m.getApplicationProperties();
Map map = props.getValue();
String op = (String) map.get(OPCODE);
- if("create-link".equals(op))
+ if("reset".equals(op))
+ {
+ for(Sender sender : sendingLinks.values())
+ {
+ try
+ {
+ sender.close();
+ Session session1 = sender.getSession();
+ session1.close();
+ session1.getConnection().close();
+ }
+ catch(Exception e)
+ {
+ e.printStackTrace();
+ }
+ }
+ for(Receiver receiver : receivingLinks.values())
+ {
+ try
+ {
+ receiver.close();
+ receiver.getSession().close();
+ receiver.getSession().getConnection().close();
+ }
+ catch(Exception e)
+ {
+ e.printStackTrace();
+ }
+ }
+ sendingLinks.clear();
+ receivingLinks.clear();
+ }
+ else if(CREATE_LINK.equals(op))
{
Object linkRef = map.get(LINK_REF);
String host = (String) map.get(HOST);
- int port = Integer.parseInt((String) map.get(PORT));
+ Object o = map.get(PORT);
+ int port = Integer.parseInt(String.valueOf(o));
String user = (String) map.get(SASL_USER);
String password = (String) map.get(SASL_PASSWORD);
String role = (String) map.get(ROLE);
String address = (String) map.get(ADDRESS);
+ System.err.println("Host: " + host + "\tPort: " + port + "\t user: " + user +"\t password: " + password);
+ try{
- Connection conn2 = new Connection(host, port, user, password);
- Session session2 = conn2.createSession();
- if(SENDER.equals(role))
- {
- System.err.println("%%% Creating sender (" + linkRef + ")");
- Sender sender = session2.createSender(address);
- sendingLinks.put(linkRef, sender);
+ Connection conn2 = new Connection(host, port, user, password,
+ "development.mycompany.mysystem.stormmq.com");
+ Session session2 = conn2.createSession();
+ if(sendingLinks.containsKey(linkRef))
+ {
+ try
+ {
+ sendingLinks.remove(linkRef).close();
+ }
+ catch (Exception e)
+ {
+
+ }
+ }
+ if(receivingLinks.containsKey(linkRef))
+ {
+ try
+ {
+ receivingLinks.remove(linkRef).close();
+ }
+ catch (Exception e)
+ {
+
+ }
+ }
+ if(SENDER.equals(role))
+ {
+
+ System.err.println("%%% Creating sender (" + linkRef + ")");
+ Sender sender = session2.createSender(address);
+ sendingLinks.put(linkRef, sender);
+ }
+ else
+ {
+
+ System.err.println("%%% Creating receiver (" + linkRef + ")");
+ Receiver receiver2 = session2.createReceiver(address);
+ receiver2.setCredit(UnsignedInteger.valueOf(getWindowSize()), true);
+
+ receivingLinks.put(linkRef, receiver2);
+ }
}
- else
+ catch(Exception e)
{
-
- System.err.println("%%% Creating receiver (" + linkRef + ")");
- Receiver receiver2 = session2.createReceiver(address);
- receiver2.setCredit(UnsignedInteger.valueOf(getWindowSize()), true);
-
- receivingLinks.put(linkRef, receiver2);
+ e.printStackTrace();
}
}
else if(SEND_MESSAGE.equals(op))
@@ -231,22 +297,25 @@ public class Demo extends Util
m2props.setMessageId(messageId);
Map m2propmap = new HashMap();
m2propmap.put(OPCODE, TEST);
- m2propmap.put(VENDOR, APACHE);
+ m2propmap.put(VENDOR, vendor);
ApplicationProperties m2appProps = new ApplicationProperties(m2propmap);
- Message m2 = new Message(Arrays.asList(m2props, m2appProps, amqpValue));
+ Message m2 = new Message(Arrays.asList(m2props, m2appProps, new AmqpValue("AMQP-"+messageId)));
sender.send(m2);
Map m3propmap = new HashMap();
m3propmap.put(OPCODE, LOG);
m3propmap.put(ACTION, SENT);
m3propmap.put(MESSAGE_ID, messageId);
- m3propmap.put(VENDOR, APACHE);
+ m3propmap.put(VENDOR, vendor);
+ m3propmap.put(MESSAGE_VENDOR, vendor);
+
Message m3 = new Message(Arrays.asList(new ApplicationProperties(m3propmap),
- amqpValue));
+ new AmqpValue("AMQP-"+messageId)));
s.send(m3);
}
+
responseReceiver.acknowledge(m);
}
else
@@ -267,10 +336,11 @@ public class Demo extends Util
m3propmap.put(OPCODE, LOG);
m3propmap.put(ACTION, RECEIVED);
m3propmap.put(MESSAGE_ID, mp.getMessageId());
- m3propmap.put(VENDOR, ap.getValue().get(VENDOR));
+ m3propmap.put(VENDOR, vendor);
+ m3propmap.put(MESSAGE_VENDOR, ap.getValue().get(VENDOR));
Message m3 = new Message(Arrays.asList(new ApplicationProperties(m3propmap),
- amqpValue));
+ new AmqpValue("AMQP-"+mp.getMessageId())));
s.send(m3);
entry.getValue().acknowledge(m);
Modified: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Receiver.java
URL: http://svn.apache.org/viewvc/qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Receiver.java?rev=1179293&r1=1179292&r2=1179293&view=diff
==============================================================================
--- qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Receiver.java (original)
+++ qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Receiver.java Wed Oct 5 16:14:32 2011
@@ -444,6 +444,11 @@ public class Receiver implements Deliver
}
}
+ public Session getSession()
+ {
+ return _session;
+ }
+
public static interface SettledAction
{
public void onSettled(Binary deliveryTag);
Modified: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Sender.java
URL: http://svn.apache.org/viewvc/qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Sender.java?rev=1179293&r1=1179292&r2=1179293&view=diff
==============================================================================
--- qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Sender.java (original)
+++ qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Sender.java Wed Oct 5 16:14:32 2011
@@ -351,6 +351,11 @@ public class Sender implements DeliveryS
return _endpoint.getInitialUnsettledMap();
}
+ public Session getSession()
+ {
+ return _session;
+ }
+
public class SenderCreationException extends Exception
{
public SenderCreationException(Throwable e)
Modified: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Session.java
URL: http://svn.apache.org/viewvc/qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Session.java?rev=1179293&r1=1179292&r2=1179293&view=diff
==============================================================================
--- qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Session.java (original)
+++ qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Session.java Wed Oct 5 16:14:32 2011
@@ -49,9 +49,11 @@ public class Session
private SectionEncoder _sectionEncoder;
private SectionDecoder _sectionDecoder;
private TransactionController _sessionLocalTC;
+ private Connection _connection;
public Session(final Connection connection, String name)
{
+ _connection = connection;
_endpoint = connection.getEndpoint().createSession(name);
_sectionEncoder = new SectionEncoderImpl(connection.getEndpoint().getDescribedTypeRegistry());
_sectionDecoder = new SectionDecoderImpl(connection.getEndpoint().getDescribedTypeRegistry());
@@ -345,4 +347,8 @@ public class Session
return null;
}
+ public Connection getConnection()
+ {
+ return _connection;
+ }
}
Modified: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Util.java
URL: http://svn.apache.org/viewvc/qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Util.java?rev=1179293&r1=1179292&r2=1179293&view=diff
==============================================================================
--- qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Util.java (original)
+++ qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Util.java Wed Oct 5 16:14:32 2011
@@ -52,6 +52,8 @@ public abstract class Util
private int _windowSize = 100;
private String _subject;
private String _filter;
+ private String _remoteHost;
+ private boolean _useSSL;
protected Util(String[] args)
{
@@ -89,6 +91,17 @@ public abstract class Util
.hasArg(true)
.withArgName("CONTAINER_NAME")
.create('C'));
+
+ options.addOption(OptionBuilder.withLongOpt("ssl")
+ .withDescription("Use SSL")
+ .create('S'));
+
+ options.addOption(OptionBuilder.withLongOpt("remote-hostname")
+ .withDescription( "hostname to supply in the open frame" )
+ .hasArg(true)
+ .withArgName("HOST")
+ .create('O'));
+
if(hasBlockOption())
options.addOption(OptionBuilder.withLongOpt("block")
.withDescription("block until messages arrive")
@@ -207,9 +220,11 @@ public abstract class Util
System.exit(0);
}
_host = cmdLine.getOptionValue('H',"0.0.0.0");
+ _remoteHost = cmdLine.getOptionValue('O',null);
String portStr = cmdLine.getOptionValue('p',"5672");
String countStr = cmdLine.getOptionValue('c',"1");
+ _useSSL = cmdLine.hasOption('S');
if(hasWindowSizeOption())
{
@@ -486,8 +501,10 @@ public abstract class Util
public Connection newConnection() throws Connection.ConnectionException
{
Container container = getContainerName() == null ? new Container() : new Container(getContainerName());
- return getUsername() == null ? new Connection(getHost(), getPort(), null, null, _frameSize, container)
- : new Connection(getHost(), getPort(), getUsername(), getPassword(), _frameSize, container);
+ return getUsername() == null ? new Connection(getHost(), getPort(), null, null, _frameSize, container,
+ _remoteHost, _useSSL)
+ : new Connection(getHost(), getPort(), getUsername(), getPassword(), _frameSize,
+ container, _remoteHost, _useSSL);
}
public String getContainerName()
Modified: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/framing/SASLFrameHandler.java
URL: http://svn.apache.org/viewvc/qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/framing/SASLFrameHandler.java?rev=1179293&r1=1179292&r2=1179293&view=diff
==============================================================================
--- qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/framing/SASLFrameHandler.java (original)
+++ qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/framing/SASLFrameHandler.java Wed Oct 5 16:14:32 2011
@@ -190,6 +190,11 @@ public class SASLFrameHandler implements
break;
}
+ if(type != 1)
+ {
+ System.err.println("Wrong frame type for SASL Frame");
+ }
+
// channel
/*if(channel > _connection.getChannelMax())
Modified: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/ConnectionEndpoint.java
URL: http://svn.apache.org/viewvc/qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/ConnectionEndpoint.java?rev=1179293&r1=1179292&r2=1179293&view=diff
==============================================================================
--- qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/ConnectionEndpoint.java (original)
+++ qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/ConnectionEndpoint.java Wed Oct 5 16:14:32 2011
@@ -109,6 +109,7 @@ public class ConnectionEndpoint implemen
private CallbackHanderSource _callbackHandlersource;
private SaslServer _saslServer;
private boolean _authenticated;
+ private String _remoteHostname;
public ConnectionEndpoint(Container container, CallbackHanderSource cbs)
{
@@ -221,6 +222,7 @@ public class ConnectionEndpoint implemen
open.setChannelMax(UnsignedShort.valueOf(DEFAULT_CHANNEL_MAX));
open.setContainerId(_container.getId());
open.setMaxFrameSize(getDesiredMaxFrameSize());
+ open.setHostname(getRemoteHostname());
send(CONNECTION_CONTROL_CHANNEL, open);
@@ -922,4 +924,14 @@ public class ConnectionEndpoint implemen
{
_remoteAddress = remoteAddress;
}
+
+ public String getRemoteHostname()
+ {
+ return _remoteHostname;
+ }
+
+ public void setRemoteHostname(final String remoteHostname)
+ {
+ _remoteHostname = remoteHostname;
+ }
}
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org