# This patch file was generated by NetBeans IDE
# Following Index: paths are relative to: /Users/amontenegro/work/jboss/arquillian/trunk/containers/jbossas-remote-51
# This patch can be applied using context Tools: Patch action on respective folder.
# It uses platform neutral UTF-8 encoding and \n newlines.
# Above lines and this line are ignored by the patching process.
Index: pom.xml
--- pom.xml Base (BASE)
+++ pom.xml Locally Modified (Based On LOCAL)
@@ -71,6 +71,11 @@
          <type>pom</type>
          <version>5.1.0.GA</version>
       </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossas</groupId>
+            <artifactId>jboss-server-manager</artifactId>
+            <version>1.0.3.GA</version>
+        </dependency>
       <!--
          <dependency> <groupId>org.jboss.jbossas</groupId>
          <artifactId>jboss-as-profileservice</artifactId>
Index: src/main/java/org/jboss/arquillian/jboss/JbossRemoteContainer.java
--- src/main/java/org/jboss/arquillian/jboss/JbossRemoteContainer.java Base (BASE)
+++ src/main/java/org/jboss/arquillian/jboss/JbossRemoteContainer.java Locally Modified (Based On LOCAL)
@@ -16,6 +16,9 @@
  */
 package org.jboss.arquillian.jboss;
 
+import com.sun.net.httpserver.HttpExchange;
+import com.sun.net.httpserver.HttpHandler;
+import com.sun.net.httpserver.HttpServer;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -26,9 +29,9 @@
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
-
 import javax.naming.InitialContext;
-
+import org.jboss.arquillian.jboss.utils.AsLifecycleDelegate;
+import org.jboss.arquillian.jboss.utils.PropertiesManager;
 import org.jboss.arquillian.protocol.servlet.ServletMethodExecutor;
 import org.jboss.arquillian.spi.ContainerMethodExecutor;
 import org.jboss.arquillian.spi.DeployableContainer;
@@ -37,90 +40,100 @@
 import org.jboss.deployers.spi.management.deploy.DeploymentManager;
 import org.jboss.deployers.spi.management.deploy.DeploymentProgress;
 import org.jboss.deployers.spi.management.deploy.DeploymentStatus;
+import org.jboss.jbossas.servermanager.Server;
+import org.jboss.jbossas.servermanager.ServerController;
+import org.jboss.jbossas.servermanager.ServerManager;
 import org.jboss.profileservice.spi.ProfileKey;
 import org.jboss.profileservice.spi.ProfileService;
 import org.jboss.shrinkwrap.api.Archive;
 import org.jboss.shrinkwrap.api.exporter.ZipExporter;
 import org.jboss.virtual.VFS;
 
-import com.sun.net.httpserver.HttpExchange;
-import com.sun.net.httpserver.HttpHandler;
-import com.sun.net.httpserver.HttpServer;
-
 /**
  * JbossRemoteContainer
  *
+ * @author <a href="mailto:amontenegro@ifitec.com">Alejandro Montenegro</a>
  * @author <a href="mailto:aslak@conduct.no">Aslak Knutsen</a>
  * @version $Revision: $
  */
 public class JbossRemoteContainer implements DeployableContainer
 {
-   // TODO: replace by configuration
-   private static final String HOST_ADDRESS = "localhost";
-   
-   //private static final Logger log = Logger.getLogger(JbossRemoteContainer.class.getName());
-   
+    public static final String HOST_PROPERTY_NAME = "org.jboss.arquillian.container.host";
+    public static final String FORCE_RESTART_PROPERTY_NAME = "org.jboss.arquillian.container.forceRestart";
+    public static final String SHUTDOWN_DELAY_PROPERTY_NAME = "org.jboss.arquillian.container.jboss.shutdownDelay";
+    private static final String BOOT_TIMEOUT_PROPERTY_NAME = "org.jboss.arquillian.container.jboss.bootTimeout";
+    public static final String SERVER_NAME = AsLifecycleDelegate.SERVER_NAME_DEFAULT;
+    private static AsLifecycleDelegate delegate;
+    private Server server;
+    private ServerManager manager;
+    private HttpServer httpFileServer;
+    private boolean wasStarted;
    private final List<String> failedUndeployments = new ArrayList<String>();
    private DeploymentManager deploymentManager;
+    private String host;
+    private final PropertiesManager properties;
+    private Boolean forceRestart;
+    private Integer shutdownDelay;
+    private Long bootTimeout;
 
-   private HttpServer httpFileServer;
-   
-   public JbossRemoteContainer()
-   {
+    public JbossRemoteContainer() {
+        this.properties = new PropertiesManager();
+        manager = getDelegate().getServerManager();
+        server = new Server();
+        server.setName(SERVER_NAME);
+        AsLifecycleDelegate.applyServerDefaults(server, manager);
    }
    
    @Override
-   public void start() throws LifecycleException
-   {
-      try 
-      {
+    public void start() throws LifecycleException {
+
+        try {
+            restartServer();
+        } catch (IOException e) {
+            throw new LifecycleException("Could not start remote container", e);
+        }
+
+        try {
          // TODO: configure http bind address
          httpFileServer = HttpServer.create();
-         httpFileServer.bind(new InetSocketAddress(InetAddress.getByName(HOST_ADDRESS), 9000), -1);
+            httpFileServer.bind(new InetSocketAddress(InetAddress.getByName(getHost()), 9000), -1);
          httpFileServer.start();
+
          initDeploymentManager();
-      } 
-      catch (Exception e) 
-      {
+        } catch (Exception e) {
          throw new LifecycleException("Could not connect to container", e);
       }
    }
    
    @Override
-   public void stop() throws LifecycleException
-   {
-      try 
-      {
+    public void stop() throws LifecycleException {
+        try {
          httpFileServer.stop(0);
          removeFailedUnDeployments();
-      } 
-      catch (Exception e) 
-      {
+        } catch (Exception e) {
          throw new LifecycleException("Could not clean up", e);
       }
+        if (wasStarted) {
+            stopServer();
    }
+    }
 
    @Override
-   public ContainerMethodExecutor deploy(final Archive<?> archive) throws DeploymentException
-   {
-      if(archive == null) 
-      {
+    public ContainerMethodExecutor deploy(final Archive<?> archive) throws DeploymentException {
+        if (archive == null) {
          throw new IllegalArgumentException("Archive must be specified");
       }
-      if (deploymentManager == null)
-      {
+        if (deploymentManager == null) {
          throw new IllegalStateException("start has not been called!");
       }
       String deploymentName = archive.getName();
       
       Exception failure = null;
-      try
-      {
-         httpFileServer.createContext("/" + deploymentName, new HttpHandler()
-         {
+        try {
+            httpFileServer.createContext("/" + deploymentName, new HttpHandler() {
+
             @Override
-            public void handle(HttpExchange exchange) throws IOException
-            {
+                public void handle(HttpExchange exchange) throws IOException {
                InputStream zip = archive.as(ZipExporter.class).exportZip();
                ByteArrayOutputStream zipStream = new ByteArrayOutputStream();
                JbossRemoteContainer.copy(zip, zipStream);
@@ -140,80 +153,118 @@
          DeploymentProgress distribute = deploymentManager.distribute(deploymentName, fileServerUrl, true);
          distribute.run();
          DeploymentStatus uploadStatus = distribute.getDeploymentStatus(); 
-         if(uploadStatus.isFailed()) 
-         {
+            if (uploadStatus.isFailed()) {
             failure = uploadStatus.getFailure();
             undeploy(deploymentName);
-         } 
-         else 
-         {
+            } else {
             DeploymentProgress progress = deploymentManager.start(deploymentName);
             progress.run();
             DeploymentStatus status = progress.getDeploymentStatus();
-            if (status.isFailed())
-            {
+                if (status.isFailed()) {
                failure = status.getFailure();
                undeploy(deploymentName);
             }
          }
-      }
-      catch (Exception e)
-      {
+        } catch (Exception e) {
          throw new DeploymentException("Could not deploy " + deploymentName, e);
       }
-      if (failure != null)
-      {
-         throw new DeploymentException("Failed to deply " + deploymentName, failure);
+        if (failure != null) {
+            throw new DeploymentException("Failed to deploy " + deploymentName, failure);
       }
-      try 
-      {
+        try {
          return new ServletMethodExecutor(
                new URL(
                      "http",
                      findRemoteServerHostAddress(),
                      8080, 
-                     "/")
-               );
-      } 
-      catch (Exception e) 
-      {
+                    "/"));
+        } catch (Exception e) {
          throw new RuntimeException("Could not create ContianerMethodExecutor", e);
       }
    }
 
    @Override
-   public void undeploy(Archive<?> archive) throws DeploymentException
-   {
-      if(archive == null) 
-      {
+    public void undeploy(Archive<?> archive) throws DeploymentException {
+        if (archive == null) {
          throw new IllegalArgumentException("Archive must be specified");
       }
       undeploy(archive.getName());
    }
 
-   private void undeploy(String name) throws DeploymentException
-   {
-      try
-      {
+    private void undeploy(String name) throws DeploymentException {
+        try {
          DeploymentProgress stopProgress = deploymentManager.stop(name);
          stopProgress.run();
 
          DeploymentProgress undeployProgress = deploymentManager.remove(name);
          undeployProgress.run();
-         if (undeployProgress.getDeploymentStatus().isFailed())
-         {
+            if (undeployProgress.getDeploymentStatus().isFailed()) {
             failedUndeployments.add(name);
          }
          httpFileServer.removeContext("/" + name);
-      }
-      catch (Exception e)
-      {
+        } catch (Exception e) {
          throw new DeploymentException("Could not undeploy " + name, e);
       }
    }
 
-   private void initDeploymentManager() throws Exception 
-   {
+    protected void restartServer() throws IOException, LifecycleException {
+        if (getForceRestart()) {
+            if (isServerUp()) {
+                //logger().info("Shutting down server as in force-restart mode");
+                stopServer();
+                try {
+                    Thread.sleep(getShutdownDelay());
+                } catch (InterruptedException e) {
+                    Thread.currentThread().interrupt();
+                }
+            }
+        }
+        if (!isServerUp()) {
+            wasStarted = true;
+            startServer();
+            //logger().info("Starting server");
+            // Wait for server to come up
+            long timeoutTime = System.currentTimeMillis() + getServerBootTimeout();
+            boolean interrupted = false;
+            while (timeoutTime > System.currentTimeMillis()) {
+                if (isServerUp()) {
+                    //logger().info("Started server");
+                    return;
+                }
+                try {
+                    Thread.sleep(200);
+                } catch (InterruptedException e) {
+                    interrupted = true;
+                }
+            }
+            if (interrupted) {
+                Thread.currentThread().interrupt();
+            }
+            // If we got this far something went wrong
+            //logger().warning("Unable to connect to server after " + getServerBootTimeout() + "ms, giving up!");
+            stopServer();
+            throw new IllegalStateException("Error connecting to server");
+        }
+    }
+
+    protected void stopServer() throws LifecycleException {
+        try {
+            getDelegate().stopJbossAs(SERVER_NAME);
+        } catch (Throwable t) {
+            throw new LifecycleException("could not stop remote container");
+        }
+    }
+
+    private void startServer() throws LifecycleException {
+        try {
+
+            getDelegate().startJbossAs(SERVER_NAME);
+        } catch (Throwable t) {
+            throw new LifecycleException("could not stop remote container");
+        }
+    }
+
+    private void initDeploymentManager() throws Exception {
       String profileName = "default";
       InitialContext ctx = new InitialContext();
       ProfileService ps = (ProfileService) ctx.lookup("ProfileService");
@@ -223,80 +274,117 @@
       VFS.init();
    }
    
-   private URL createFileServerURL(String archiveName) 
-   {
-      try 
-      {
-         InetSocketAddress address = httpFileServer.getAddress();
-         return new URL(
-               "http", 
-               address.getHostName(), 
-               address.getPort(), 
-               "/" + archiveName);
-      }
-      catch (MalformedURLException e) 
-      {
-         throw new RuntimeException("Could not create fileserver url", e);
-      }
-   }
-   
-   private void removeFailedUnDeployments() throws IOException
-   {
+    private void removeFailedUnDeployments() throws IOException {
       List<String> remainingDeployments = new ArrayList<String>();
-      for (String name : failedUndeployments)
-      {
-         try
-         {
+        for (String name : failedUndeployments) {
+            try {
             DeploymentProgress undeployProgress = deploymentManager.remove(name);
             undeployProgress.run();
-            if (undeployProgress.getDeploymentStatus().isFailed())
-            {
+                if (undeployProgress.getDeploymentStatus().isFailed()) {
                remainingDeployments.add(name);
             }
-         }
-         catch (Exception e)
-         {
+            } catch (Exception e) {
             IOException ioe = new IOException();
             ioe.initCause(e);
             throw ioe;
          }
       }
-      if (remainingDeployments.size() > 0)
-      {
+        if (remainingDeployments.size() > 0) {
          //log.error("Failed to undeploy these artifacts: " + remainingDeployments);
       }
       failedUndeployments.clear();
    }
 
-   private String findRemoteServerHostAddress() {
-      try 
-      {
-         String providerURL = (String)new InitialContext().getEnvironment().get(
-               InitialContext.PROVIDER_URL);
-         
-         return providerURL.substring(0, providerURL.indexOf(":"));
+    protected String getHost() {
+        if (host == null) {
+            host = getProperties().getStringValue(getHostPropertyName(), "localhost", false);
       } 
-      catch (Exception e) 
-      {
-         throw new RuntimeException("Could not determine host address", e);
+        return host;
       }
+
+    protected PropertiesManager getProperties() {
+        return properties;
    }
    
-   private static void copy(InputStream source, OutputStream destination) throws IOException
-   {
-      if (source == null)
-      {
+    protected String getHostPropertyName() {
+        return HOST_PROPERTY_NAME;
+    }
+
+    private static void copy(InputStream source, OutputStream destination) throws IOException {
+        if (source == null) {
          throw new IllegalArgumentException("source cannot be null");
       }
-      if (destination == null)
-      {
+        if (destination == null) {
          throw new IllegalArgumentException("destination cannot be null");
       }
       byte[] readBuffer = new byte[2156]; 
       int bytesIn = 0; 
-      while((bytesIn = source.read(readBuffer)) != -1) 
-      { 
+        while ((bytesIn = source.read(readBuffer)) != -1) {
          destination.write(readBuffer, 0, bytesIn); 
       }
    }
+
+    private URL createFileServerURL(String archiveName) {
+        try {
+            InetSocketAddress address = httpFileServer.getAddress();
+            return new URL(
+                    "http",
+                    address.getHostName(),
+                    address.getPort(),
+                    "/" + archiveName);
+        } catch (MalformedURLException e) {
+            throw new RuntimeException("Could not create fileserver url", e);
 }
+    }
+
+    private String findRemoteServerHostAddress() {
+        try {
+            String providerURL = (String) new InitialContext().getEnvironment().get(
+                    InitialContext.PROVIDER_URL);
+
+            return providerURL.substring(0, providerURL.indexOf(":"));
+        } catch (Exception e) {
+            throw new RuntimeException("Could not determine host address", e);
+        }
+    }
+
+    private synchronized static AsLifecycleDelegate getDelegate() {
+        if (delegate == null) {
+            delegate = new AsLifecycleDelegate();
+        }
+        return delegate;
+    }
+
+    protected boolean isServerUp() throws IOException {
+        return ServerController.isServerStarted(server);
+    }
+
+    protected Boolean getForceRestart() {
+        if (forceRestart == null) {
+            this.forceRestart = getProperties().getBooleanValue(getForceRestartPropertyName(), false, false);
+        }
+        return forceRestart;
+    }
+
+    protected String getForceRestartPropertyName() {
+        return FORCE_RESTART_PROPERTY_NAME;
+    }
+
+    protected Integer getShutdownDelay() {
+        if (shutdownDelay == null) {
+            this.shutdownDelay = getProperties().getIntValue(SHUTDOWN_DELAY_PROPERTY_NAME, 15000, false);
+        }
+        return shutdownDelay;
+    }
+
+    protected Long getServerBootTimeout() {
+        if (bootTimeout == null) {
+            this.bootTimeout = getProperties().getLongValue(getServerBootTimeoutPropertyName(), 240000, false);
+        }
+        return bootTimeout;
+    }
+
+    protected String getServerBootTimeoutPropertyName() {
+        return BOOT_TIMEOUT_PROPERTY_NAME;
+    }
+}
Index: src/main/java/org/jboss/arquillian/jboss/utils/AsLifecycleDelegate.java
--- src/main/java/org/jboss/arquillian/jboss/utils/AsLifecycleDelegate.java Locally New
+++ src/main/java/org/jboss/arquillian/jboss/utils/AsLifecycleDelegate.java Locally New
@@ -0,0 +1,176 @@
+package org.jboss.arquillian.jboss.utils;
+
+import org.jboss.jbossas.servermanager.Server;
+import org.jboss.jbossas.servermanager.ServerController;
+import org.jboss.jbossas.servermanager.ServerManager;
+import org.jboss.jbossas.servermanager.Argument;
+import org.jboss.jbossas.servermanager.Property;
+
+import java.io.File;
+
+/**
+ * @author amontenegro <amontenegro@ifitec.com>
+ */
+public class AsLifecycleDelegate
+{
+
+   /*
+    * Environment Variables
+    */
+
+   private static final String ENV_VAR_JAVA_HOME = "JAVA_HOME";
+
+   private static final String ENV_VAR_JBOSS_HOME = "JBOSS_HOME";
+
+   /**
+    * The Configuration Name to use
+    *
+    * For this, "default" will suffice as we're only testing the
+    * start/stop of AS, not its full complement
+    */
+   public static final String SERVER_NAME_DEFAULT = "default";
+
+   private ServerManager serverManager;
+
+   /**
+    * Constructor
+    */
+   public AsLifecycleDelegate()
+   {
+      // Create and set a new ServerManager
+      ServerManager sm = new ServerManager();
+      applyServerManagerDefaults(sm);
+      this.setServerManager(sm);
+   }
+
+   /**
+    * Lifecycle Start
+    *
+    * Starts JBossASs
+    *
+    * @throws Throwable
+    */
+   public void startJbossAs(String serverName) throws Throwable
+   {
+      Server server = null;
+
+      // Get ServerManager
+      ServerManager manager = this.getServerManager();
+
+      try
+      {
+         server = manager.getServer(serverName);
+      }
+      catch (IllegalArgumentException e)
+      {
+         // Create the Server
+         server = new Server();
+         server.setName(serverName);
+
+         // Add a Server to the Manager with defaults
+         applyServerDefaults(server, manager);
+      }
+
+      // Start the Server
+      ServerController.startServer(server, manager);
+   }
+
+   /**
+    * Lifecycle Stop
+    *
+    * Stops JBossAS
+    *
+    * @throws Throwable
+    */
+   public void stopJbossAs(String serverName) throws Throwable
+   {
+      // Obtain the server
+      ServerManager manager = this.getServerManager();
+      Server server = manager.getServer(serverName);
+
+      // If started/running
+      if (ServerController.isServerStarted(server))
+      {
+         // Stop
+         ServerController.stopServer(server, manager);
+      }
+   }
+
+   /**
+    * Apply defaults to ServerManager
+    *
+    * @param manager the server manager to apply defaults to
+    * @return the server manager with applied defaults
+    */
+   public static ServerManager applyServerManagerDefaults(final ServerManager manager)
+   {
+      // Set JVM / JBOSS_HOME
+      manager.setJavaHome(getJavaHome());
+      manager.setJbossHome(getJbossHome());
+
+      // Set UDP group to use
+      // manager.setUdpGroup("241.34.53.227");
+
+      return manager;
+   }
+
+   /**
+    * Apply defaults to Server
+    *
+    * @param server the server to apply defaults to
+    * @return the Server with applied defaults
+    */
+   public static Server applyServerDefaults(final Server server, final ServerManager manager)
+   {
+      // add Server to manager
+      manager.addServer(server);
+
+      server.setUsername("admin");
+      server.setPassword("admin");
+      server.setPartition(Long.toHexString(System.currentTimeMillis()));
+
+      // Set server's JVM arguments
+      Argument arg = new Argument();
+      arg.setValue("-Xmx512m");
+      server.addJvmArg(arg);
+      arg = new Argument();
+      arg.setValue("-XX:MaxPermSize=128m");
+      server.addJvmArg(arg);
+
+      // Set server's system properties
+      Property prop = new Property();
+      prop.setKey("jbosstest.udp.ip_ttl");
+      prop.setValue("0");
+      server.addSysProperty(prop);
+      prop = new Property();
+      prop.setKey("java.endorsed.dirs");
+      prop.setValue(new File(manager.getJBossHome(), "lib/endorsed").getAbsolutePath());
+      server.addSysProperty(prop);
+
+      return server;
+   }
+
+   //----------------------------------------------------------------------------------||
+   // Internal Helper Methods ---------------------------------------------------------||
+   //----------------------------------------------------------------------------------||
+
+   public static String getJavaHome()
+   {
+      return System.getenv(ENV_VAR_JAVA_HOME);
+   }
+
+   public static String getJbossHome()
+   {
+      return System.getenv(ENV_VAR_JBOSS_HOME);
+   }
+
+   public ServerManager getServerManager()
+   {
+      return serverManager;
+   }
+
+   private void setServerManager(ServerManager manager)
+   {
+      this.serverManager = manager;
+   }
+}
Index: src/main/java/org/jboss/arquillian/jboss/utils/EnumerationIterable.java
--- src/main/java/org/jboss/arquillian/jboss/utils/EnumerationIterable.java Locally New
+++ src/main/java/org/jboss/arquillian/jboss/utils/EnumerationIterable.java Locally New
@@ -0,0 +1,34 @@
+package org.jboss.arquillian.jboss.utils;
+
+import java.util.Enumeration;
+import java.util.Iterator;
+
+/**
+ * @author amontenegro <amontenegro@ifitec.com>
+ */
+class EnumerationIterable<T> implements Iterable<T>
+{
+   // The enumeration-iteartor
+   private EnumerationIterator<T> iterator;
+
+   /**
+    * Constructor
+    *
+    * @param enumeration The enumeration
+    */
+   public EnumerationIterable(Enumeration<T> enumeration)
+   {
+      this.iterator = new EnumerationIterator<T>(enumeration);
+   }
+
+   /**
+    * Gets an iterator
+    *
+    * @return The iterator
+    */
+   public Iterator<T> iterator()
+   {
+      return iterator;
+   }
+
+}
Index: src/main/java/org/jboss/arquillian/jboss/utils/EnumerationIterator.java
--- src/main/java/org/jboss/arquillian/jboss/utils/EnumerationIterator.java Locally New
+++ src/main/java/org/jboss/arquillian/jboss/utils/EnumerationIterator.java Locally New
@@ -0,0 +1,52 @@
+package org.jboss.arquillian.jboss.utils;
+
+import java.util.Enumeration;
+import java.util.Iterator;
+
+/**
+ * @author amontenegro <amontenegro@ifitec.com>
+ */
+class EnumerationIterator<T> implements Iterator<T>
+{
+   // The enumeration
+   private Enumeration e;
+
+   /**
+    * Constructor
+    *
+    * @param e The enumeration
+    */
+   public EnumerationIterator(Enumeration e)
+   {
+      this.e = e;
+   }
+
+   /**
+    * Indicates if there are more items to iterate
+    *
+    * @return True if more, false otherwise
+    */
+   public boolean hasNext()
+   {
+      return e.hasMoreElements();
+   }
+
+   /**
+    * Gets the next item
+    *
+    * @return The next items
+    */
+   public T next()
+   {
+      return (T) e.nextElement();
+   }
+
+   /**
+    * Removes an item. Not supported
+    */
+   public void remove()
+   {
+      throw new UnsupportedOperationException();
+   }
+
+}
Index: src/main/java/org/jboss/arquillian/jboss/utils/PropertiesManager.java
--- src/main/java/org/jboss/arquillian/jboss/utils/PropertiesManager.java Locally New
+++ src/main/java/org/jboss/arquillian/jboss/utils/PropertiesManager.java Locally New
@@ -0,0 +1,227 @@
+package org.jboss.arquillian.jboss.utils;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.HashSet;
+import java.util.Properties;
+import java.util.Set;
+import java.util.logging.Level;
+import org.apache.log4j.Logger;
+
+/**
+ * @author amontenegro <amontenegro@ifitec.com>
+ */
+public class PropertiesManager
+{
+   // The resource bundle used to control Web Beans RI deployment
+   public static final String RESOURCE_BUNDLE = "META-INF/jboss-test-harness.properties";
+
+   // The class to work from
+   private SimpleResourceLoader resourceLoader;
+
+   /**
+    * Constructor
+    *
+    * @param classLoader The classloader to work on
+    */
+   public PropertiesManager()
+   {
+      this.resourceLoader = new SimpleResourceLoader();
+   }
+
+   /**
+    * Get a list of possible values for a given key.
+    *
+    * First, System properties are tried, followed by the specified resource
+    * bundle (first in classpath only).
+    *
+    * @param key The key to search for
+    * @return A list of possible values. An empty list is returned if there are
+    *         no matches.
+    */
+   public Set<String> getPropertyValues(String key)
+   {
+      Set<String> values = new HashSet<String>();
+      addPropertiesFromSystem(key, values);
+      addPropertiesFromResourceBundle(key, values);
+      return values;
+   }
+
+   /**
+    * Adds matches from system properties
+    *
+    * @param key The key to match
+    * @param values The currently found values
+    */
+   private void addPropertiesFromSystem(String key, Set<String> values)
+   {
+      addProperty(key, System.getProperty(key), values);
+   }
+
+   /**
+    * Adds matches from detected resource bundles
+    *
+    * @param key The key to match
+    * @param values The currently found values
+    */
+   private void addPropertiesFromResourceBundle(String key, Set<String> values)
+   {
+      try
+      {
+         for (URL url : resourceLoader.getResources(RESOURCE_BUNDLE))
+         {
+            Properties properties = new Properties();
+            InputStream propertyStream = url.openStream();
+            try
+            {
+               properties.load(propertyStream);
+               addProperty(key, properties.getProperty(key), values);
+            }
+            finally
+            {
+               if (propertyStream != null)
+               {
+                  propertyStream.close();
+               }
+            }
+         }
+      }
+      catch (IOException e)
+      {
+         // No - op, file is optional
+      }
+   }
+
+   /**
+    * Add the property to the set of properties only if it hasn't already been
+    * added
+    *
+    * @param key The key searched for
+    * @param value The value of the property
+    * @param values The currently found values
+    */
+   private void addProperty(String key, String value, Set<String> values)
+   {
+      if (value != null)
+      {
+         values.add(value);
+      }
+
+   }
+
+   /**
+    * Gets the possible implementation class for a given property for which the
+    * values are classanames
+    *
+    * @param deploymentProperties The deployment properties object to use
+    * @param resourceLoader The resource laoder to use to attempt
+    * @param propertyName The name of the property to load
+    * @return A set of classes specified
+    */
+   @SuppressWarnings("unchecked")
+   public <T> Set<Class<T>> getClasses(String propertyName, Class<T> expectedType)
+   {
+      Set<Class<T>> classes = new HashSet<Class<T>>();
+      for (String className : getPropertyValues(propertyName))
+      {
+         try
+         {
+            classes.add((Class<T>) resourceLoader.classForName(className));
+         }
+         catch (ResourceLoadingException e)
+         {
+            //Logger.log(Level.WARNING, "Unable to load class " + className + " for property " + propertyName, e);
+         }
+      }
+      return classes;
+   }
+
+   public <T> Class<T> getClassValue(String propertyName, Class<T> expectedType, boolean required)
+   {
+      Set<Class<T>> classes = getClasses(propertyName, expectedType);
+      if (classes.size() == 0)
+      {
+         if (required)
+         {
+            throw new IllegalArgumentException("Cannot find any implementations of " + expectedType.getSimpleName() + ", check that " + propertyName + " is specified");
+         }
+         else
+         {
+            return null;
+         }
+      }
+      else if (classes.size() > 1)
+      {
+         throw new IllegalArgumentException("More than one implementation of " + expectedType.getSimpleName() + " specified by " + propertyName + ", not sure which one to use!");
+      }
+      else
+      {
+         return classes.iterator().next();
+      }
+   }
+
+   public <T> T getInstanceValue(String propertyName, Class<T> expectedType, boolean required)
+   {
+      Class<T> clazz = getClassValue(propertyName, expectedType, required);
+      if (clazz != null)
+      {
+         try
+         {
+            return clazz.newInstance();
+         }
+         catch (InstantiationException e)
+         {
+            throw new IllegalStateException("Error instantiating " + clazz + " specified by " + propertyName, e);
+         }
+         catch (IllegalAccessException e)
+         {
+            throw new IllegalStateException("Error instantiating " + clazz + " specified by " + propertyName, e);
+         }
+      }
+      else
+      {
+         return null;
+      }
+   }
+
+   public boolean getBooleanValue(String propertyName, boolean _default, boolean required)
+   {
+      return Boolean.valueOf(getStringValue(propertyName, _default ? "true" : "false", required));
+   }
+
+   public int getIntValue(String propertyName, int _default, boolean required)
+   {
+      return Integer.valueOf(getStringValue(propertyName, Integer.toString(_default), required)).intValue();
+   }
+
+   public long getLongValue(String propertyName, long _default, boolean required)
+   {
+      return Long.valueOf(getStringValue(propertyName, Long.toString(_default), required)).longValue();
+   }
+
+   public String getStringValue(String propertyName, String _default, boolean required)
+   {
+      Set<String> values = getPropertyValues(propertyName);
+      if (values.size() == 0)
+      {
+         if (required)
+         {
+            throw new IllegalArgumentException("Cannot find required property " + propertyName + ", check that it is specified");
+         }
+         else
+         {
+            return _default;
+         }
+      }
+      else if (values.size() > 1)
+      {
+         throw new IllegalArgumentException("More than one value given for " + propertyName + ", not sure which one to use!");
+      }
+      else
+      {
+         return values.iterator().next();
+      }
+   }
+
+}
Index: src/main/java/org/jboss/arquillian/jboss/utils/ResourceLoadingException.java
--- src/main/java/org/jboss/arquillian/jboss/utils/ResourceLoadingException.java Locally New
+++ src/main/java/org/jboss/arquillian/jboss/utils/ResourceLoadingException.java Locally New
@@ -0,0 +1,49 @@
+package org.jboss.arquillian.jboss.utils;
+
+/**
+ * @author amontenegro <amontenegro@ifitec.com>
+ */
+class ResourceLoadingException extends RuntimeException
+{
+   private static final long serialVersionUID = 1L;
+
+   /**
+    * Constructor
+    */
+   public ResourceLoadingException()
+   {
+      super();
+   }
+
+   /**
+    * Constructor
+    *
+    * @param message The message
+    * @param throwable The exception
+    */
+   public ResourceLoadingException(String message, Throwable throwable)
+   {
+      super(message, throwable);
+   }
+
+   /**
+    * Constructor
+    *
+    * @param message The message
+    */
+   public ResourceLoadingException(String message)
+   {
+      super(message);
+   }
+
+   /**
+    * Constructor
+    *
+    * @param throwable The exception
+    */
+   public ResourceLoadingException(Throwable throwable)
+   {
+      super(throwable);
+   }
+
+}
Index: src/main/java/org/jboss/arquillian/jboss/utils/SimpleResourceLoader.java
--- src/main/java/org/jboss/arquillian/jboss/utils/SimpleResourceLoader.java Locally New
+++ src/main/java/org/jboss/arquillian/jboss/utils/SimpleResourceLoader.java Locally New
@@ -0,0 +1,56 @@
+package org.jboss.arquillian.jboss.utils;
+
+import java.io.IOException;
+import java.net.URL;
+/**
+ * @author amontenegro <amontenegro@ifitec.com>
+ */
+public class SimpleResourceLoader {
+   public Class<?> classForName(String name)
+   {
+
+      try
+      {
+         if (Thread.currentThread().getContextClassLoader() != null)
+         {
+            return Thread.currentThread().getContextClassLoader().loadClass(name);
+         }
+         else
+         {
+            return Class.forName(name);
+         }
+      }
+      catch (ClassNotFoundException e)
+      {
+         throw new ResourceLoadingException(e);
+      }
+      catch (NoClassDefFoundError e)
+      {
+         throw new ResourceLoadingException(e);
+      }
+   }
+
+   public URL getResource(String name)
+   {
+      return getClass().getResource(name);
+   }
+
+   public Iterable<URL> getResources(String name)
+   {
+      try
+      {
+         if (Thread.currentThread().getContextClassLoader() != null)
+         {
+            return new EnumerationIterable<URL>(Thread.currentThread().getContextClassLoader().getResources(name));
+         }
+         else
+         {
+            return new EnumerationIterable<URL>(getClass().getClassLoader().getResources(name));
+         }
+      }
+      catch (IOException e)
+      {
+         throw new ResourceLoadingException(e);
+      }
+   }
+}