Removed TLS suffix in preparation for merge

Author: smhc

pom.xml

@@ -8,11 +8,11 @@
         <relativePath />
     </parent>
     <groupId>org.jenkins-ci.plugins</groupId>
-    <artifactId>docker-swarm-tls</artifactId>
+    <artifactId>docker-swarm</artifactId>
     <version>1.6-SMHC-SNAPSHOT</version>
     <packaging>hpi</packaging>
 
-    <name>Docker Swarm Plugin - TLS</name>
+    <name>Docker Swarm Plugin</name>
     <description>Cloud plugin for launching single use agent as a service on docker swarm.</description>
     <url>https://wiki.jenkins.io/display/JENKINS/Docker+Swarm+Plugin</url>
     <licenses>

src/main/java/org/jenkinsci/plugins/docker/swarm/DockerSwarmAgentInfo.java

@@ -20,7 +20,7 @@ public DockerSwarmAgentInfo(final boolean provisioningInProgress) {
 
     @Override
     public String getIconFileName() {
-        return "/plugin/docker-swarm-tls/images/24x24/docker.png";
+        return "/plugin/docker-swarm/images/24x24/docker.png";
     }
 
     @Override

src/main/java/org/jenkinsci/plugins/docker/swarm/DockerSwarmCloud.java

@@ -56,7 +56,7 @@
 import javax.net.ssl.SSLContext;
 
 public class DockerSwarmCloud extends Cloud {
-    private static final String DOCKER_SWARM_CLOUD_NAME = "Docker Swarm TLS";
+    private static final String DOCKER_SWARM_CLOUD_NAME = "Docker Swarm";
     private static final Logger LOGGER = Logger.getLogger(DockerSwarmCloud.class.getName());
     private String jenkinsUrl;
     private String swarmNetwork;

src/main/java/org/jenkinsci/plugins/docker/swarm/dashboard/UIPage.java

@@ -9,7 +9,7 @@
 public class UIPage implements RootAction {
     @Override
     public String getIconFileName() {
-        return "/plugin/docker-swarm-tls/images/24x24/docker.png";
+        return "/plugin/docker-swarm/images/24x24/docker.png";
     }
 
     @Override