Clean up old rabbitmq support

- Only scan for rabbit service label "rabbitmq-2.4"

- Continue to parse credentials in both old (broken apart)
 and new (url) formats

Change-Id: Ie9fc198232b1f88ecee9ff29b7ed70cc84815b85

cloudfoundry-runtime/src/main/java/org/cloudfoundry/runtime/env/CloudEnvironment.java

@@ -48,13 +48,7 @@ private static void labelledServiceType(Class<? extends AbstractServiceInfo> ser
 		labelledServiceType(RdbmsServiceInfo.class, "postgresql-9.0");
 		labelledServiceType(RedisServiceInfo.class, "redis-2.2");
 		labelledServiceType(MongoServiceInfo.class, "mongodb-1.8");
-
-                // the old rabbitmq service
 		labelledServiceType(RabbitServiceInfo.class, "rabbitmq-2.4");
-                // rabbitmq SRS-based service, during testing
-		labelledServiceType(RabbitServiceInfo.class, "rabbitmq-srs-2.4.1");
-                // rabbitmq SRS-based service, after the old service is gone
-		labelledServiceType(RabbitServiceInfo.class, "rabbitmq-2.4.1");
 	}
 
 	/* package for testing purpose */

cloudfoundry-runtime/src/test/java/org/cloudfoundry/runtime/env/CloudEnvironmentTest.java

@@ -116,6 +116,10 @@ public void getServiceInfoPostgresql() {
 		assertEquals(password, info.getPassword());
 	}
 
+	/**
+	 * Verifies parsing of credentials in the format of "old"
+	 * Rabbit service (still used by chef recipe deployment)
+	 */
 	@Test
 	public void getServiceInfoRabbit() {
 		String serviceName = "rabbit-1";
@@ -133,6 +137,9 @@ public void getServiceInfoRabbit() {
 		assertEquals(port, info.getPort());
 	}
 
+	/**
+	 * Verifies parsing of credentials in the existing Rabbit service
+	 */
 	@Test
 	public void getServiceSRSInfoRabbit() {
 		String serviceName = "rabbit-1";

cloudfoundry-runtime/src/test/resources/org/cloudfoundry/runtime/service/test-rabbit-info.json

@@ -2,6 +2,7 @@
 	"name":"$serviceName",
 	"label":"rabbitmq-2.4",
 	"plan":"free",
+	"tags":["rabbitmq"],
 	"credentials":{
 			"hostname":"$hostname",
 			"port":$port,

cloudfoundry-runtime/src/test/resources/org/cloudfoundry/runtime/service/test-rabbit-srs-info.json

@@ -1,8 +1,8 @@
 {
 	"name":"$serviceName",
-	"label":"rabbitmq-srs-2.4.1",
+	"label":"rabbitmq-2.4",
 	"plan":"free",
-	"tags":["rabbitmq-srs"],
+	"tags":["rabbitmq"],
 	"credentials":{
 		"url":"$url"
 	}