Index: src/test/java/hudson/plugins/deploy/glassfish/GlassFish3xAdapterTest.java
===================================================================
--- src/test/java/hudson/plugins/deploy/glassfish/GlassFish3xAdapterTest.java	(revision 37471)
+++ src/test/java/hudson/plugins/deploy/glassfish/GlassFish3xAdapterTest.java	(working copy)
@@ -28,7 +28,7 @@
 
     @Before
     public void setup() {
-        adapter = new GlassFish3xAdapter(home, password, username, port);
+        adapter = new GlassFish3xAdapter(home, password, username, port, "localhost");
     }
 
     @Test
Index: src/test/java/hudson/plugins/deploy/glassfish/GlassFishAdapterTest.java
===================================================================
--- src/test/java/hudson/plugins/deploy/glassfish/GlassFishAdapterTest.java	(revision 37471)
+++ src/test/java/hudson/plugins/deploy/glassfish/GlassFishAdapterTest.java	(working copy)
@@ -22,7 +22,7 @@
 
     @Before
     public void setup() {
-        glassFish3xAdapter = new GlassFish3xAdapter(home, password, username, port);
+        glassFish3xAdapter = new GlassFish3xAdapter(home, password, username, port, "localhost");
     }
 
     @Test
Index: src/main/java/hudson/plugins/deploy/glassfish/GlassFish3xAdapter.java
===================================================================
--- src/main/java/hudson/plugins/deploy/glassfish/GlassFish3xAdapter.java	(revision 37471)
+++ src/main/java/hudson/plugins/deploy/glassfish/GlassFish3xAdapter.java	(working copy)
@@ -2,7 +2,13 @@
 
 import hudson.Extension;
 import hudson.plugins.deploy.ContainerAdapterDescriptor;
+import java.util.logging.Logger;
+import org.codehaus.cargo.container.Container;
+import org.codehaus.cargo.container.glassfish.GlassFishPropertySet;
 import org.codehaus.cargo.container.glassfish.GlassFishStandaloneLocalConfiguration;
+import org.codehaus.cargo.container.property.GeneralPropertySet;
+import org.codehaus.cargo.generic.ContainerFactory;
+import org.codehaus.cargo.generic.configuration.ConfigurationFactory;
 import org.kohsuke.stapler.DataBoundConstructor;
 
 /**
@@ -12,19 +18,34 @@
  */
 public class GlassFish3xAdapter extends GlassFishAdapter {
 
+    //private static Logger logger = Logger.getLogger("hudson.plugins.deploy.glassfish.GlassFish3xAdapter");
+
+    @Property(GeneralPropertySet.HOSTNAME)
+    public final String host;
+
     /**
      * GlassFish 3.x
      *
      * @param home GlassFish home directory
      * @param password glassfish admin password
      * @param userName glassfish admin username
+     * @param host glassfish host
      */
     @DataBoundConstructor
-    public GlassFish3xAdapter(String home, String password, String userName, Integer adminPort) {
+    public GlassFish3xAdapter(String home, String password, String userName, Integer adminPort, String host) {
+        
         super(home, password, userName, adminPort);
-        GlassFishStandaloneLocalConfiguration conf;
+        this.host = host;
     }
 
+    @Override
+    protected Container getContainer(ConfigurationFactory configFactory, ContainerFactory containerFactory, String id)
+    {
+        return super.getContainer(configFactory, containerFactory, id);
+    }
+
+
+
     /**
      * GlassFish Cargo containerId
      * @return glassfish3x
@@ -32,6 +53,7 @@
     @Override
     protected String getContainerId() {
         return "glassfish3x";
+
     }
 
     /**
Index: src/main/java/hudson/plugins/deploy/DefaultCargoContainerAdapterImpl.java
===================================================================
--- src/main/java/hudson/plugins/deploy/DefaultCargoContainerAdapterImpl.java	(revision 37471)
+++ src/main/java/hudson/plugins/deploy/DefaultCargoContainerAdapterImpl.java	(working copy)
@@ -1,5 +1,6 @@
 package hudson.plugins.deploy;
 
+import java.util.logging.Logger;
 import org.apache.commons.beanutils.ConvertUtils;
 import org.codehaus.cargo.container.configuration.Configuration;
 
@@ -15,6 +16,9 @@
  * @author Kohsuke Kawaguchi
  */
 public abstract class DefaultCargoContainerAdapterImpl extends CargoContainerAdapter {
+
+    //private static Logger logger = Logger.getLogger("hudson.plugins.deploy.DefaultCargoContainerAdapterImpl");
+
     @Target(FIELD)
     @Retention(RUNTIME)
     @Documented
@@ -36,8 +40,9 @@
 
             try {
                 String v = ConvertUtils.convert(f.get(this));
-                if(v!=null)
+                if(v!=null){
                     config.setProperty(p.value(), v);
+                }
             } catch (IllegalAccessException e) {
                 IllegalAccessError x = new IllegalAccessError();
                 x.initCause(e);
Index: src/main/resources/hudson/plugins/deploy/glassfish/GlassFishAdapter/config.jelly
===================================================================
--- src/main/resources/hudson/plugins/deploy/glassfish/GlassFishAdapter/config.jelly	(revision 37471)
+++ src/main/resources/hudson/plugins/deploy/glassfish/GlassFishAdapter/config.jelly	(working copy)
@@ -1,17 +1,21 @@
+
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define"
          xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
-  <f:entry title="Manager user name" field="userName">
-    <f:textbox />
-  </f:entry>
-  <f:entry title="Manager password" field="password">
-    <f:password />
-  </f:entry>
-  <f:entry title="GlassFish home" field="home">
-    <f:textbox />
-  </f:entry>
-  <f:advanced>
-    <f:entry title="GlassFish admin port" field="adminPort">
-      <f:textbox />
+    <f:entry title="Manager user name" field="userName">
+        <f:textbox />
     </f:entry>
-  </f:advanced>
+    <f:entry title="Manager password" field="password">
+        <f:password />
+    </f:entry>
+    <f:entry title="GlassFish home" field="home">
+        <f:textbox />
+    </f:entry>
+    <f:advanced>
+        <f:entry title="GlassFish URL" field="host">
+            <f:textbox />
+        </f:entry>
+        <f:entry title="GlassFish admin port" field="adminPort">
+            <f:textbox />
+        </f:entry>
+    </f:advanced>
 </j:jelly>
\ No newline at end of file
Index: pom.xml
===================================================================
--- pom.xml	(revision 37471)
+++ pom.xml	(working copy)
@@ -110,6 +110,6 @@
   </repositories-->
 
   <properties>
-    <cargo.version>1.0.4</cargo.version>
+    <cargo.version>1.0.6-SNAPSHOT</cargo.version>
   </properties>
 </project>