Index: /ora/cvsroot/cargo_trunk/extensions/maven2/src/main/java/org/codehaus/cargo/maven2/Container.java
===================================================================
--- /ora/cvsroot/cargo_trunk/extensions/maven2/src/main/java/org/codehaus/cargo/maven2/Container.java	(revision 930)
+++ /ora/cvsroot/cargo_trunk/extensions/maven2/src/main/java/org/codehaus/cargo/maven2/Container.java	(working copy)
@@ -20,6 +20,7 @@
 package org.codehaus.cargo.maven2;
 
 import java.io.File;
+import java.util.Map;
 
 import org.apache.maven.plugin.MojoExecutionException;
 import org.codehaus.cargo.container.ContainerType;
@@ -62,6 +63,18 @@
 
     private Long timeout;
 
+    private Map systemProperties;
+
+    public Map getSystemProperties()
+    {
+        return this.systemProperties;
+    }
+
+    public void setSystemProperties(Map systemProperties)
+    {
+        this.systemProperties = systemProperties;
+    }
+
     public Long getTimeout()
     {
         return this.timeout;
@@ -168,6 +181,7 @@
                 setupHome((InstalledLocalContainer) container);
                 setupOutput((InstalledLocalContainer) container, project);
                 setupExtraClasspath((InstalledLocalContainer) container, project);
+                setupSystemProperties((InstalledLocalContainer) container);
             }
         }
         setupLogger(container, logger);
@@ -212,6 +226,13 @@
         }
     }
 
+    private void setupSystemProperties(InstalledLocalContainer container) throws MojoExecutionException {
+        if(getSystemProperties() != null)
+        {
+            container.setSystemProperties(getSystemProperties());
+        }
+    }
+
     /**
      * Set up a home dir (possibly using a ZipURLInstaller).
      */