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 2007/01/24 18:19:20 UTC
svn commit: r499490 - in /incubator/qpid/trunk/qpid/java:
broker/distribution/src/main/assembly/
broker/src/main/java/org/apache/qpid/server/handler/
client/src/main/java/org/apache/qpid/client/
client/src/main/java/org/apache/qpid/client/handler/ clie...
Author: rgreig
Date: Wed Jan 24 09:19:19 2007
New Revision: 499490
URL: http://svn.apache.org/viewvc?view=rev&rev=499490
Log:
QPID-50 : Patch supplied by Rob Godfrey - Virtual Host implementation
Modified:
incubator/qpid/trunk/qpid/java/broker/distribution/src/main/assembly/broker-bin.xml
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionOpenMethodHandler.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionURL.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionTuneMethodHandler.java
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/connectionurl/ConnectionURLTest.java
Modified: incubator/qpid/trunk/qpid/java/broker/distribution/src/main/assembly/broker-bin.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/distribution/src/main/assembly/broker-bin.xml?view=diff&rev=499490&r1=499489&r2=499490
==============================================================================
--- incubator/qpid/trunk/qpid/java/broker/distribution/src/main/assembly/broker-bin.xml (original)
+++ incubator/qpid/trunk/qpid/java/broker/distribution/src/main/assembly/broker-bin.xml Wed Jan 24 09:19:19 2007
@@ -105,37 +105,37 @@
<source>../../common/bin/qpid-run</source>
<outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
<destName>qpid-run</destName>
- <fileMode>493</fileMode>
+ <fileMode>473</fileMode>
</file>
<file>
<source>../bin/qpid-server</source>
<outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
<destName>qpid-server</destName>
- <fileMode>493</fileMode>
+ <fileMode>473</fileMode>
</file>
<file>
<source>../bin/qpid-server.bat</source>
<outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
<destName>qpid-server.bat</destName>
- <fileMode>493</fileMode>
+ <fileMode>473</fileMode>
</file>
<file>
<source>../bin/run.bat</source>
<outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
<destName>run.bat</destName>
- <fileMode>493</fileMode>
+ <fileMode>473</fileMode>
</file>
<file>
<source>../bin/run.sh</source>
<outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
<destName>run.sh</destName>
- <fileMode>493</fileMode>
+ <fileMode>473</fileMode>
</file>
<file>
<source>../bin/runAll</source>
<outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
<destName>runAll</destName>
- <fileMode>493</fileMode>
+ <fileMode>473</fileMode>
</file>
</files>
Modified: incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionOpenMethodHandler.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionOpenMethodHandler.java?view=diff&rev=499490&r1=499489&r2=499490
==============================================================================
--- incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionOpenMethodHandler.java (original)
+++ incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionOpenMethodHandler.java Wed Jan 24 09:19:19 2007
@@ -58,7 +58,16 @@
AMQProtocolSession session = stateManager.getProtocolSession();
ConnectionOpenBody body = evt.getMethod();
- String virtualHostName = String.valueOf(body.virtualHost);
+ //ignore leading '/'
+ String virtualHostName;
+ if((body.virtualHost != null) && body.virtualHost.charAt(0) == '/')
+ {
+ virtualHostName = new StringBuilder(body.virtualHost.subSequence(1,body.virtualHost.length())).toString();
+ }
+ else
+ {
+ virtualHostName = String.valueOf(body.virtualHost);
+ }
VirtualHost virtualHost = stateManager.getVirtualHostRegistry().getVirtualHost(virtualHostName);
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java?view=diff&rev=499490&r1=499489&r2=499490
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java Wed Jan 24 09:19:19 2007
@@ -202,7 +202,7 @@
_clientName = connectionURL.getClientName();
_username = connectionURL.getUsername();
_password = connectionURL.getPassword();
- _virtualHost = connectionURL.getVirtualHost();
+ setVirtualHost(connectionURL.getVirtualHost());
_failoverPolicy = new FailoverPolicy(connectionURL);
@@ -313,6 +313,15 @@
_clientName = clientName;
_username = username;
_password = password;
+ setVirtualHost(virtualHost);
+ }
+
+ private void setVirtualHost(String virtualHost)
+ {
+ if(virtualHost.startsWith("/"))
+ {
+ virtualHost = virtualHost.substring(1);
+ }
_virtualHost = virtualHost;
}
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionURL.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionURL.java?view=diff&rev=499490&r1=499489&r2=499490
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionURL.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionURL.java Wed Jan 24 09:19:19 2007
@@ -114,10 +114,6 @@
if (virtualHost != null && (!virtualHost.equals("")))
{
- if(virtualHost.startsWith("/"))
- {
- virtualHost = virtualHost.substring(1);
- }
setVirtualHost(virtualHost);
}
else
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionTuneMethodHandler.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionTuneMethodHandler.java?view=diff&rev=499490&r1=499489&r2=499490
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionTuneMethodHandler.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionTuneMethodHandler.java Wed Jan 24 09:19:19 2007
@@ -63,7 +63,12 @@
stateManager.changeState(AMQState.CONNECTION_NOT_OPENED);
protocolSession.writeFrame(createTuneOkFrame(evt.getChannelId(), params));
- protocolSession.writeFrame(createConnectionOpenFrame(evt.getChannelId(), new AMQShortString(protocolSession.getAMQConnection().getVirtualHost()), null, true));
+
+ String host = protocolSession.getAMQConnection().getVirtualHost();
+ AMQShortString virtualHost = new AMQShortString("/" + host);
+
+
+ protocolSession.writeFrame(createConnectionOpenFrame(evt.getChannelId(), virtualHost, null, true));
}
protected AMQFrame createConnectionOpenFrame(int channel, AMQShortString path, AMQShortString capabilities, boolean insist)
Modified: incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/connectionurl/ConnectionURLTest.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/connectionurl/ConnectionURLTest.java?view=diff&rev=499490&r1=499489&r2=499490
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/connectionurl/ConnectionURLTest.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/connectionurl/ConnectionURLTest.java Wed Jan 24 09:19:19 2007
@@ -40,7 +40,7 @@
assertTrue(connectionurl.getFailoverMethod().equals("roundrobin"));
assertTrue(connectionurl.getUsername().equals("ritchiem"));
assertTrue(connectionurl.getPassword().equals("bob"));
- assertTrue(connectionurl.getVirtualHost().equals("test"));
+ assertTrue(connectionurl.getVirtualHost().equals("/test"));
assertTrue(connectionurl.getBrokerCount() == 2);
@@ -67,7 +67,7 @@
assertTrue(connectionurl.getFailoverMethod() == null);
assertTrue(connectionurl.getUsername().equals("ritchiem"));
assertTrue(connectionurl.getPassword().equals("bob"));
- assertTrue(connectionurl.getVirtualHost().equals("test"));
+ assertTrue(connectionurl.getVirtualHost().equals("/test"));
assertTrue(connectionurl.getBrokerCount() == 1);
@@ -87,7 +87,7 @@
assertTrue(connectionurl.getFailoverMethod() == null);
assertTrue(connectionurl.getUsername().equals("ritchiem"));
assertTrue(connectionurl.getPassword().equals(""));
- assertTrue(connectionurl.getVirtualHost().equals("test"));
+ assertTrue(connectionurl.getVirtualHost().equals("/test"));
assertTrue(connectionurl.getBrokerCount() == 1);
@@ -125,7 +125,7 @@
assertTrue(connectionurl.getFailoverMethod() == null);
assertTrue(connectionurl.getUsername().equals("guest"));
assertTrue(connectionurl.getPassword().equals("guest"));
- assertTrue(connectionurl.getVirtualHost().equals("test"));
+ assertTrue(connectionurl.getVirtualHost().equals("/test"));
assertTrue(connectionurl.getBrokerCount() == 1);
@@ -148,7 +148,7 @@
assertTrue(connectionurl.getFailoverMethod() == null);
assertTrue(connectionurl.getUsername().equals("guest"));
assertTrue(connectionurl.getPassword().equals("guest"));
- assertTrue(connectionurl.getVirtualHost().equals("test"));
+ assertTrue(connectionurl.getVirtualHost().equals("/test"));
assertTrue(connectionurl.getClientName().equals("clientname"));
@@ -171,7 +171,7 @@
assertTrue(connectionurl.getFailoverMethod() == null);
assertTrue(connectionurl.getUsername().equals("guest"));
assertTrue(connectionurl.getPassword().equals("guest"));
- assertTrue(connectionurl.getVirtualHost().equals("test"));
+ assertTrue(connectionurl.getVirtualHost().equals("/test"));
assertTrue(connectionurl.getBrokerCount() == 1);
@@ -194,7 +194,7 @@
assertTrue(connectionurl.getFailoverMethod() == null);
assertTrue(connectionurl.getUsername().equals("guest"));
assertTrue(connectionurl.getPassword().equals("guest"));
- assertTrue(connectionurl.getVirtualHost().equals("test"));
+ assertTrue(connectionurl.getVirtualHost().equals("/test"));
assertTrue(connectionurl.getBrokerCount() == 1);
@@ -216,7 +216,7 @@
assertTrue(connectionurl.getFailoverMethod() == null);
assertTrue(connectionurl.getUsername().equals("guest"));
assertTrue(connectionurl.getPassword().equals("guest"));
- assertTrue(connectionurl.getVirtualHost().equals("test"));
+ assertTrue(connectionurl.getVirtualHost().equals("/test"));
assertTrue(connectionurl.getBrokerCount() == 1);
@@ -238,7 +238,7 @@
assertTrue(connectionurl.getFailoverMethod() == null);
assertTrue(connectionurl.getUsername().equals("guest"));
assertTrue(connectionurl.getPassword().equals("guest"));
- assertTrue(connectionurl.getVirtualHost().equals("test"));
+ assertTrue(connectionurl.getVirtualHost().equals("/test"));
assertTrue(connectionurl.getBrokerCount() == 1);
@@ -283,7 +283,7 @@
assertTrue(connectionurl.getFailoverMethod() == null);
assertTrue(connectionurl.getUsername().equals("guest"));
assertTrue(connectionurl.getPassword().equals("guest"));
- assertTrue(connectionurl.getVirtualHost().equals("test"));
+ assertTrue(connectionurl.getVirtualHost().equals("/test"));
assertTrue(connectionurl.getBrokerCount() == 1);
@@ -308,7 +308,7 @@
assertTrue(connectionurl.getFailoverMethod() == null);
assertTrue(connectionurl.getUsername().equals("guest"));
assertTrue(connectionurl.getPassword().equals("guest"));
- assertTrue(connectionurl.getVirtualHost().equals("test"));
+ assertTrue(connectionurl.getVirtualHost().equals("/test"));
assertTrue(connectionurl.getBrokerCount() == 1);
@@ -329,7 +329,7 @@
assertTrue(connectionurl.getFailoverMethod().equals("roundrobin"));
assertTrue(connectionurl.getUsername().equals("ritchiem"));
assertTrue(connectionurl.getPassword().equals("bob"));
- assertTrue(connectionurl.getVirtualHost().equals("test"));
+ assertTrue(connectionurl.getVirtualHost().equals("/test"));
assertTrue(connectionurl.getBrokerCount() == 2);
@@ -369,7 +369,7 @@
assertTrue(connectionurl.getUsername().equals("user"));
assertTrue(connectionurl.getPassword().equals(""));
- assertTrue(connectionurl.getVirtualHost().equals("test"));
+ assertTrue(connectionurl.getVirtualHost().equals("/test"));
assertTrue(connectionurl.getBrokerCount() == 1);
}
@@ -428,7 +428,7 @@
String url = "amqp://guest:guest@/t.-_+!=:?brokerlist='tcp://localhost:5672'";
AMQConnectionURL connection = new AMQConnectionURL(url);
- assertTrue(connection.getVirtualHost().equals("t.-_+!=:"));
+ assertTrue(connection.getVirtualHost().equals("/t.-_+!=:"));
}
public void testCheckDefaultPort() throws URLSyntaxException