support the amQPs scheme

And the scheme names are now case-insensitive.

Author: Alexandru Scvortov

src/com/rabbitmq/client/ConnectionFactory.java

@@ -187,11 +187,16 @@ public void setVirtualHost(String virtualHost) {
      * @param uriString is the AMQP URI containing the data
      */
     public void setUri(String uriString)
-        throws URISyntaxException
+        throws URISyntaxException, NoSuchAlgorithmException, KeyManagementException
     {
         URI uri = new URI(uriString);
 
-        if (!"amqp".equals(uri.getScheme())) {
+        if ("amqp".equals(uri.getScheme().toLowerCase())) {
+            // nothing special to do
+        } else if ("amqps".equals(uri.getScheme().toLowerCase())) {
+            setPort(DEFAULT_AMQP_OVER_SSL_PORT);
+            useSslProtocol();
+        } else {
             throw new IllegalArgumentException("Wrong scheme in AMQP URI: " + uriString);
         }
 

test/src/com/rabbitmq/client/test/AmqpUriTest.java

@@ -18,11 +18,15 @@
 
 import com.rabbitmq.client.ConnectionFactory;
 
+import java.security.KeyManagementException;
+import java.security.NoSuchAlgorithmException;
 import java.net.URISyntaxException;
 
 public class AmqpUriTest extends BrokerTestCase
 {
-    public void testUriParsing() throws URISyntaxException {
+    public void testUriParsing()
+        throws URISyntaxException, NoSuchAlgorithmException, KeyManagementException
+    {
         /* From the spec (subset of the tests) */
         parseSuccess("amqp://user:pass@host:10000/vhost",
                      "user", "pass", "host", 10000, "vhost");
@@ -68,7 +72,7 @@ public void testUriParsing() throws URISyntaxException {
 
     private void parseSuccess(String uri, String user, String password,
                               String host, int port, String vhost)
-        throws URISyntaxException
+        throws URISyntaxException, NoSuchAlgorithmException, KeyManagementException
     {
         ConnectionFactory cf = new ConnectionFactory();
         cf.setUri(uri);

test/src/com/rabbitmq/examples/StressPersister.java

@@ -19,6 +19,8 @@
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.net.URISyntaxException;
+import java.security.KeyManagementException;
+import java.security.NoSuchAlgorithmException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -86,7 +88,9 @@ private static int sizeArg(CommandLine cmd, char opt, int def) {
     public long topStartTime;
     public PrintWriter logOut;
 
-    public void configure(String[] args) throws ParseException, URISyntaxException {
+    public void configure(String[] args)
+        throws ParseException, URISyntaxException, NoSuchAlgorithmException, KeyManagementException
+    {
         Options options = new Options();
         options.addOption(new Option("h", "uri", true, "AMQP URI"));
         options.addOption(new Option("C", "comment", true, "comment text"));

test/src/com/rabbitmq/examples/TestMain.java

@@ -19,6 +19,8 @@
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.security.KeyManagementException;
+import java.security.NoSuchAlgorithmException;
 import java.net.URISyntaxException;
 
 import com.rabbitmq.client.AMQP;
@@ -75,7 +77,7 @@ private static class TestConnectionFactory extends ConnectionFactory {
         private final int protocolMinor;
 
         public TestConnectionFactory(int major, int minor, String uri)
-            throws URISyntaxException
+            throws URISyntaxException, NoSuchAlgorithmException, KeyManagementException
         {
             this.protocolMajor = major;
             this.protocolMinor = minor;
@@ -97,7 +99,7 @@ public void sendHeader() throws IOException {
     }
 
     public static void runConnectionNegotiationTest(final String uri)
-        throws IOException, URISyntaxException
+        throws IOException, URISyntaxException, NoSuchAlgorithmException, KeyManagementException
     {
 
         Connection conn;
@@ -156,7 +158,7 @@ private static void checkNegotiatedMaxValue(String name,
     }
 
     public static void runConnectionShutdownTests(final String uri)
-        throws IOException, URISyntaxException
+        throws IOException, URISyntaxException, NoSuchAlgorithmException, KeyManagementException
     {
         Connection conn;
         Channel ch;
@@ -180,7 +182,7 @@ public static void runConnectionShutdownTests(final String uri)
     }
 
     public static void runProducerConsumerTest(String uri, int commitEvery)
-        throws IOException, URISyntaxException
+        throws IOException, URISyntaxException, NoSuchAlgorithmException, KeyManagementException
     {
         ConnectionFactory cfconnp = new ConnectionFactory();
         cfconnp.setUri(uri);