Author: arnaudsimon
Date: Mon Aug 20 02:37:31 2007
New Revision: 567629
URL: http://svn.apache.org/viewvc?rev=567629&view=rev
Log:
Updated QpidURL scheme
Modified:
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/ConnectionFactoryImpl.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/naming/PropertiesFileInitialContextFactory.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/naming/jndi.properties
Modified:
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/ConnectionFactoryImpl.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/ConnectionFactoryImpl.java?rev=567629&r1=567628&r2=567629&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/ConnectionFactoryImpl.java
(original)
+++
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/ConnectionFactoryImpl.java
Mon Aug 20 02:37:31 2007
@@ -5,6 +5,7 @@
import javax.naming.spi.ObjectFactory;
import org.apache.qpidity.QpidException;
+import org.apache.qpidity.BrokerDetails;
import org.apache.qpidity.url.QpidURLImpl;
import org.apache.qpidity.url.QpidURL;
import org.apache.qpidity.url.BindingURLImpl;
@@ -13,6 +14,7 @@
import org.slf4j.LoggerFactory;
import java.util.Hashtable;
+import java.net.MalformedURLException;
/**
* Implements all the JMS connection factories.
@@ -67,9 +69,15 @@
_qpidURL = url;
}
- public ConnectionFactoryImpl(String url) throws URLSyntaxException
+ public ConnectionFactoryImpl(String url) throws MalformedURLException
{
- // todo
+ _qpidURL = new QpidURLImpl(url);
+ BrokerDetails bd = _qpidURL.getAllBrokerDetails().get(0);
+ _host = bd.getHost();
+ _port = bd.getPort();
+ _defaultUsername = bd.getUserName();
+ _defaultPassword = bd.getPassword();
+ _virtualHost = bd.getVirtualHost();
}
/**
@@ -474,7 +482,7 @@
return new TopicImpl(new BindingURLImpl((String)
addr.getContent()));
}
}
-
+
if (ref.getClassName().equals(DestinationImpl.class.getName()))
{
RefAddr addr = ref.get(DestinationImpl.class.getName());
Modified:
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/naming/PropertiesFileInitialContextFactory.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/naming/PropertiesFileInitialContextFactory.java?rev=567629&r1=567628&r2=567629&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/naming/PropertiesFileInitialContextFactory.java
(original)
+++
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/naming/PropertiesFileInitialContextFactory.java
Mon Aug 20 02:37:31 2007
@@ -43,7 +43,12 @@
import java.io.BufferedInputStream;
import java.io.FileInputStream;
import java.io.IOException;
+import java.net.MalformedURLException;
+/**
+ * This is an implementation of InitialContextFactory that uses a default
jndi.properties file.
+ *
+ */
public class PropertiesFileInitialContextFactory implements
InitialContextFactory
{
protected final Logger _logger =
LoggerFactory.getLogger(PropertiesFileInitialContextFactory.class);
@@ -181,7 +186,7 @@
{
return new ConnectionFactoryImpl(url);
}
- catch (URLSyntaxException urlse)
+ catch (MalformedURLException urlse)
{
_logger.warn("Unable to createFactories:" + urlse);
}
Modified:
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/naming/jndi.properties
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/naming/jndi.properties?rev=567629&r1=567628&r2=567629&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/naming/jndi.properties
(original)
+++
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/naming/jndi.properties
Mon Aug 20 02:37:31 2007
@@ -23,7 +23,8 @@
# register some connection factories
# connectionfactory.[jndiname] = [ConnectionURL]
-connectionfactory.local = amqp://guest:[EMAIL
PROTECTED]/testpath?brokerlist='vm://:1'
+# qpid:username=foo;password=password;client_id=id;[EMAIL
PROTECTED]:localhost:1556
+connectionfactory.local = qpid:tcp:localhost'
# register some queues in JNDI using the form
# queue.[jndiName] = [physicalName]
