[jboss-cvs] JBossAS SVN: r85821 - branches/Branch_5_0/system/src/main/org/jboss/system/tools.

[jboss-cvs-commits at lists.jboss.org]

Author: alesj
Date: 2009-03-13 09:04:46 -0400 (Fri, 13 Mar 2009)
New Revision: 85821

Modified:
   branches/Branch_5_0/system/src/main/org/jboss/system/tools/AbstractDeploymentRepositoryAdapter.java
   branches/Branch_5_0/system/src/main/org/jboss/system/tools/DeploymentRepositoryAdapter.java
   branches/Branch_5_0/system/src/main/org/jboss/system/tools/DeploymentScanner.java
   branches/Branch_5_0/system/src/main/org/jboss/system/tools/DeploymentScannerMBean.java
Log:
[JBAS-6330]; Rob's bugz fixes.

Modified: branches/Branch_5_0/system/src/main/org/jboss/system/tools/AbstractDeploymentRepositoryAdapter.java
===================================================================
--- branches/Branch_5_0/system/src/main/org/jboss/system/tools/AbstractDeploymentRepositoryAdapter.java	2009-03-13 13:04:05 UTC (rev 85820)
+++ branches/Branch_5_0/system/src/main/org/jboss/system/tools/AbstractDeploymentRepositoryAdapter.java	2009-03-13 13:04:46 UTC (rev 85821)
@@ -21,7 +21,6 @@
  */
 package org.jboss.system.tools;
 
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
@@ -68,9 +67,9 @@
       repository.releaseDeploymentContentLock();
    }
 
-   public URL[] listDeployedURLs()
+   public String[] listDeployedURLs()
    {
-      List<URL> urls = new ArrayList<URL>();
+      List<String> urls = new ArrayList<String>();
       try
       {
          Collection<VFSDeployment> deployments = repository.getDeployments();
@@ -78,7 +77,7 @@
          {
             for (VFSDeployment deployment : deployments)
             {
-               urls.add(deployment.getRoot().toURL());
+               urls.add(deployment.getRoot().toURL().toExternalForm());
             }
          }
       }
@@ -86,6 +85,6 @@
       {
          log.warn("Exception getting deployments: " + e);
       }
-      return urls.toArray(new URL[urls.size()]);
+      return urls.toArray(new String[urls.size()]);
    }
 }
\ No newline at end of file

Modified: branches/Branch_5_0/system/src/main/org/jboss/system/tools/DeploymentRepositoryAdapter.java
===================================================================
--- branches/Branch_5_0/system/src/main/org/jboss/system/tools/DeploymentRepositoryAdapter.java	2009-03-13 13:04:05 UTC (rev 85820)
+++ branches/Branch_5_0/system/src/main/org/jboss/system/tools/DeploymentRepositoryAdapter.java	2009-03-13 13:04:46 UTC (rev 85821)
@@ -67,9 +67,9 @@
    boolean hasURL(URL url) throws URISyntaxException;
 
    /**
-    * List deployed urls.
+    * List deployed urls as strings.
     *
     * @return the list of deployed urls
     */
-   URL[] listDeployedURLs();
+   String[] listDeployedURLs();
 }
\ No newline at end of file

Modified: branches/Branch_5_0/system/src/main/org/jboss/system/tools/DeploymentScanner.java
===================================================================
--- branches/Branch_5_0/system/src/main/org/jboss/system/tools/DeploymentScanner.java	2009-03-13 13:04:05 UTC (rev 85820)
+++ branches/Branch_5_0/system/src/main/org/jboss/system/tools/DeploymentScanner.java	2009-03-13 13:04:46 UTC (rev 85821)
@@ -123,7 +123,7 @@
       return adapter.hasURL(url);
    }
 
-   public URL[] listDeployedURLs()
+   public String[] listDeployedURLs()
    {
       return adapter.listDeployedURLs();
    }

Modified: branches/Branch_5_0/system/src/main/org/jboss/system/tools/DeploymentScannerMBean.java
===================================================================
--- branches/Branch_5_0/system/src/main/org/jboss/system/tools/DeploymentScannerMBean.java	2009-03-13 13:04:05 UTC (rev 85820)
+++ branches/Branch_5_0/system/src/main/org/jboss/system/tools/DeploymentScannerMBean.java	2009-03-13 13:04:46 UTC (rev 85821)
@@ -96,9 +96,9 @@
    boolean hasURL(URL url) throws URISyntaxException;
 
    /**
-    * List deployed urls.
+    * List deployed urls as strings.
     *
     * @return the list of deployed urls
     */
-   URL[] listDeployedURLs();
+   String[] listDeployedURLs();
 }
\ No newline at end of file