You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ri...@apache.org on 2009/04/21 18:28:34 UTC
svn commit: r767209 - in /qpid/branches/0.5-release: ./ qpid/java/
qpid/java/broker/ qpid/java/broker/bin/
qpid/java/broker/src/main/java/org/apache/qpid/server/management/
qpid/java/broker/src/main/java/org/apache/qpid/server/queue/
qpid/java/client/s...
Author: ritchiem
Date: Tue Apr 21 16:28:34 2009
New Revision: 767209
URL: http://svn.apache.org/viewvc?rev=767209&view=rev
Log:
QPID-1824 : Add ability to use a ConnectionURL String to configure a ConfigurationFactory via a 3rd party tools that use Bean properties such as Mule or Spring.
merged from trunk r767150
Added:
qpid/branches/0.5-release/qpid/java/client/src/test/java/org/apache/qpid/test/unit/jndi/
qpid/branches/0.5-release/qpid/java/client/src/test/java/org/apache/qpid/test/unit/jndi/ConnectionFactoryTest.java
Modified:
qpid/branches/0.5-release/ (props changed)
qpid/branches/0.5-release/qpid/java/ (props changed)
qpid/branches/0.5-release/qpid/java/broker/ (props changed)
qpid/branches/0.5-release/qpid/java/broker/bin/ (props changed)
qpid/branches/0.5-release/qpid/java/broker/src/main/java/org/apache/qpid/server/management/ (props changed)
qpid/branches/0.5-release/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/ (props changed)
qpid/branches/0.5-release/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionFactory.java
qpid/branches/0.5-release/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/AttributesTabControl.java (props changed)
Propchange: qpid/branches/0.5-release/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 21 16:28:34 2009
@@ -1 +1 @@
-/qpid/trunk:767083
+/qpid/trunk:767083,767150
Propchange: qpid/branches/0.5-release/qpid/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 21 16:28:34 2009
@@ -1 +1 @@
-/qpid/trunk/qpid/java:764790,764838,765132,765134,765602,765604-765605,765608,765628,765656,766004,766025,767083
+/qpid/trunk/qpid/java:764790,764838,765132,765134,765602,765604-765605,765608,765628,765656,766004,766025,767083,767150
Propchange: qpid/branches/0.5-release/qpid/java/broker/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 21 16:28:34 2009
@@ -1 +1 @@
-/qpid/trunk/qpid/java/broker:742626,743015,743028-743029,743304,743306,743311,743357,744113,747363,747367,747369-747370,747376,747783,747868-747870,747875,748561,748591,748641,748680,748686,749149,749282,749285,749315,749340,749572,753219-753220,753253,754934,754958,755256,757258,757270,758730,759097,760919,761721,762365,762992,763959,764109,764140,764790,766004,766025,767083
+/qpid/trunk/qpid/java/broker:742626,743015,743028-743029,743304,743306,743311,743357,744113,747363,747367,747369-747370,747376,747783,747868-747870,747875,748561,748591,748641,748680,748686,749149,749282,749285,749315,749340,749572,753219-753220,753253,754934,754958,755256,757258,757270,758730,759097,760919,761721,762365,762992,763959,764109,764140,764790,766004,766025,767083,767150
Propchange: qpid/branches/0.5-release/qpid/java/broker/bin/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 21 16:28:34 2009
@@ -1,2 +1,2 @@
/qpid/branches/0.5-release/qpid/java/broker/bin:757268
-/qpid/trunk/qpid/java/broker/bin:753219-753220,753253,758730,759097,760919,761721,762365,762992,763959,764109,764140,764790,766004,766025,767083
+/qpid/trunk/qpid/java/broker/bin:753219-753220,753253,758730,759097,760919,761721,762365,762992,763959,764109,764140,764790,766004,766025,767083,767150
Propchange: qpid/branches/0.5-release/qpid/java/broker/src/main/java/org/apache/qpid/server/management/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 21 16:28:34 2009
@@ -1,2 +1,2 @@
/qpid/branches/0.5-release/qpid/java/broker/src/main/java/org/apache/qpid/server/management:757268
-/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/management:753219-753220,753253,758730,759097,760919,761721,762365,762992,763959,764109,764140,764790,766004,766025,767083
+/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/management:753219-753220,753253,758730,759097,760919,761721,762365,762992,763959,764109,764140,764790,766004,766025,767083,767150
Propchange: qpid/branches/0.5-release/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 21 16:28:34 2009
@@ -1,2 +1,2 @@
/qpid/branches/0.5-release/qpid/java/broker/src/main/java/org/apache/qpid/server/queue:757257
-/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue:753219-753220,753253,757270,758730,759097,760919,761721,762365,762992,763959,764109,764140,764790,766004,766025,767083
+/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue:753219-753220,753253,757270,758730,759097,760919,761721,762365,762992,763959,764109,764140,764790,766004,766025,767083,767150
Modified: qpid/branches/0.5-release/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionFactory.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.5-release/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionFactory.java?rev=767209&r1=767208&r2=767209&view=diff
==============================================================================
--- qpid/branches/0.5-release/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionFactory.java (original)
+++ qpid/branches/0.5-release/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionFactory.java Tue Apr 21 16:28:34 2009
@@ -354,6 +354,17 @@
return _connectionDetails;
}
+ public String getConnectionURLString()
+ {
+ return _connectionDetails.toString();
+ }
+
+
+ public final void setConnectionURLString(String url) throws URLSyntaxException
+ {
+ _connectionDetails = new AMQConnectionURL(url);
+ }
+
/**
* JNDI interface to create objects from References.
*
Added: qpid/branches/0.5-release/qpid/java/client/src/test/java/org/apache/qpid/test/unit/jndi/ConnectionFactoryTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.5-release/qpid/java/client/src/test/java/org/apache/qpid/test/unit/jndi/ConnectionFactoryTest.java?rev=767209&view=auto
==============================================================================
--- qpid/branches/0.5-release/qpid/java/client/src/test/java/org/apache/qpid/test/unit/jndi/ConnectionFactoryTest.java (added)
+++ qpid/branches/0.5-release/qpid/java/client/src/test/java/org/apache/qpid/test/unit/jndi/ConnectionFactoryTest.java Tue Apr 21 16:28:34 2009
@@ -0,0 +1,75 @@
+/*
+ *
+ * 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.qpid.test.unit.jndi;
+
+import junit.framework.TestCase;
+import org.apache.qpid.client.AMQConnectionFactory;
+import org.apache.qpid.jms.BrokerDetails;
+import org.apache.qpid.jms.ConnectionURL;
+import org.apache.qpid.url.URLSyntaxException;
+
+public class ConnectionFactoryTest extends TestCase
+{
+
+ //URL will be returned with the password field swapped for '********'
+ // so ensure that these two strings are kept in sync.
+ public static final String URL = "amqp://guest:guest@clientID/test?brokerlist='tcp://localhost:5672'";
+ public static final String URL_STAR_PWD = "amqp://guest:********@clientID/test?brokerlist='tcp://localhost:5672'";
+
+ public void testConnectionURLString()
+ {
+ AMQConnectionFactory factory = new AMQConnectionFactory();
+
+ assertNull("ConnectionURL should have no value at start",
+ factory.getConnectionURL());
+
+ try
+ {
+ factory.setConnectionURLString(URL);
+ }
+ catch (URLSyntaxException e)
+ {
+ fail(e.getMessage());
+ }
+
+ //URL will be returned with the password field swapped for '********'
+ assertEquals("Connection URL not correctly set", URL_STAR_PWD, factory.getConnectionURLString());
+
+ // Further test that the processed ConnectionURL is as expected after
+ // the set call
+ ConnectionURL connectionurl = factory.getConnectionURL();
+
+ assertNull("Failover is set.", connectionurl.getFailoverMethod());
+ assertEquals("guest", connectionurl.getUsername());
+ assertEquals("guest", connectionurl.getPassword());
+ assertEquals("clientID", connectionurl.getClientName());
+ assertEquals("/test", connectionurl.getVirtualHost());
+
+ assertEquals(1, connectionurl.getBrokerCount());
+
+ BrokerDetails service = connectionurl.getBrokerDetails(0);
+
+ assertEquals("tcp", service.getTransport());
+ assertEquals("localhost", service.getHost());
+ assertEquals(5672, service.getPort());
+
+ }
+}
Propchange: qpid/branches/0.5-release/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/AttributesTabControl.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 21 16:28:34 2009
@@ -1 +1 @@
-/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/AttributesTabControl.java:762365,764790,764838,765132,765134,765602,765604-765605,765608,765628,765656,766004,766025,767083
+/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/AttributesTabControl.java:762365,764790,764838,765132,765134,765602,765604-765605,765608,765628,765656,766004,766025,767083,767150
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org