[FIXED JENKINS-19256] add support for JBoss 6 and add "AS" to display…

… names
jenkinsci · Jul 3, 2014 · b600c81 · b600c81
1 parent 744654a
commit b600c81
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 5 deletions.
diff --git a/src/main/java/hudson/plugins/deploy/jboss/JBoss3xAdapter.java b/src/main/java/hudson/plugins/deploy/jboss/JBoss3xAdapter.java
@@ -2,6 +2,7 @@
 
 import hudson.Extension;
 import hudson.plugins.deploy.ContainerAdapterDescriptor;
+
 import org.kohsuke.stapler.DataBoundConstructor;
 
 /**
@@ -15,14 +16,16 @@ public JBoss3xAdapter(String url, String password, String userName) {
         super(url, password, userName);
     }
 
+    @Override
     public String getContainerId() {
         return "jboss3x";
     }
 
     @Extension
     public static final class DescriptorImpl extends ContainerAdapterDescriptor {
+        @Override
         public String getDisplayName() {
-            return "JBoss 3.x";
+            return "JBoss AS 3.x";
         }
     }
 }
diff --git a/src/main/java/hudson/plugins/deploy/jboss/JBoss4xAdapter.java b/src/main/java/hudson/plugins/deploy/jboss/JBoss4xAdapter.java
@@ -2,11 +2,12 @@
 
 import hudson.Extension;
 import hudson.plugins.deploy.ContainerAdapterDescriptor;
+
 import org.kohsuke.stapler.DataBoundConstructor;
 
 /**
  * JBoss 4.x.
- *
+ * 
  * @author Kohsuke Kawaguchi
  */
 public class JBoss4xAdapter extends JBossAdapter {
@@ -15,14 +16,16 @@ public JBoss4xAdapter(String url, String password, String userName) {
         super(url, password, userName);
     }
 
+    @Override
     public String getContainerId() {
         return "jboss4x";
     }
 
     @Extension
     public static final class DescriptorImpl extends ContainerAdapterDescriptor {
+        @Override
         public String getDisplayName() {
-            return "JBoss 4.x";
+            return "JBoss AS 4.x";
         }
     }
 }
diff --git a/src/main/java/hudson/plugins/deploy/jboss/JBoss5xAdapter.java b/src/main/java/hudson/plugins/deploy/jboss/JBoss5xAdapter.java
@@ -2,6 +2,7 @@
 
 import hudson.Extension;
 import hudson.plugins.deploy.ContainerAdapterDescriptor;
+
 import org.kohsuke.stapler.DataBoundConstructor;
 
 /**
@@ -13,15 +14,17 @@ public JBoss5xAdapter(String url, String password, String userName) {
         super(url, password, userName);
     }
 
+    @Override
     public String getContainerId() {
         return "jboss5x";
     }
 
 
     @Extension
     public static final class DescriptorImpl extends ContainerAdapterDescriptor {
+        @Override
         public String getDisplayName() {
-            return "JBoss 5.x";
+            return "JBoss AS 5.x";
         }
     }
 }
diff --git a/src/main/java/hudson/plugins/deploy/jboss/JBoss6xAdapter.java b/src/main/java/hudson/plugins/deploy/jboss/JBoss6xAdapter.java
@@ -0,0 +1,27 @@
+package hudson.plugins.deploy.jboss;
+
+import hudson.Extension;
+import hudson.plugins.deploy.ContainerAdapterDescriptor;
+
+import org.kohsuke.stapler.DataBoundConstructor;
+
+public class JBoss6xAdapter extends JBossAdapter {
+    @DataBoundConstructor
+    public JBoss6xAdapter(String url, String password, String userName) {
+        super(url, password, userName);
+    }
+
+    @Override
+    public String getContainerId() {
+        return "jboss6x";
+    }
+
+
+    @Extension
+    public static final class DescriptorImpl extends ContainerAdapterDescriptor {
+        @Override
+        public String getDisplayName() {
+            return "JBoss AS 6.x";
+        }
+    }
+}
diff --git a/src/main/java/hudson/plugins/deploy/jboss/JBoss7xAdapter.java b/src/main/java/hudson/plugins/deploy/jboss/JBoss7xAdapter.java
@@ -21,7 +21,7 @@ public String getContainerId() {
     public static final class DescriptorImpl extends ContainerAdapterDescriptor {
         @Override
         public String getDisplayName() {
-            return "JBoss 7.x";
+            return "JBoss AS 7.x";
         }
     }
 }