[jboss-cvs] JBossAS SVN: r99021 - in trunk: testsuite/src/main/org/jboss/test/deployers/test and 1 other directory.

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

Author: emuckenhuber
Date: 2010-01-05 05:28:12 -0500 (Tue, 05 Jan 2010)
New Revision: 99021

Modified:
   trunk/profileservice/src/main/java/org/jboss/profileservice/management/upload/remoting/AbstractDeployHandler.java
   trunk/testsuite/src/main/org/jboss/test/deployers/test/LegacyDeploymentScannerUnitTestCase.java
Log:
port rev #98984

Modified: trunk/profileservice/src/main/java/org/jboss/profileservice/management/upload/remoting/AbstractDeployHandler.java
===================================================================
--- trunk/profileservice/src/main/java/org/jboss/profileservice/management/upload/remoting/AbstractDeployHandler.java	2010-01-05 10:22:25 UTC (rev 99020)
+++ trunk/profileservice/src/main/java/org/jboss/profileservice/management/upload/remoting/AbstractDeployHandler.java	2010-01-05 10:28:12 UTC (rev 99021)
@@ -105,7 +105,17 @@
       if(names == null || names.length == 0)
          return new String[0];
       
-      return deploymentRepository.getRepositoryNames(names);
+      ArrayList<String> resolvedNames = new ArrayList<String>();
+      for(ProfileKey key : this.profileRepository.getProfileKeys())
+      {
+         DeploymentRepository repository = this.profileRepository.getProfileDeploymentRepository(key);
+         String[] repositoryNames = repository.getRepositoryNames(names);
+         if(repositoryNames != null && repositoryNames.length > 0)
+         {
+            resolvedNames.addAll(Arrays.asList(repositoryNames));
+         }
+      }
+      return resolvedNames.toArray(new String[resolvedNames.size()]);
    }
    
    public String getSecurityDomain()
@@ -159,6 +169,27 @@
    }
    
    /**
+    * Try to resolve a deployment repository based on the deployment name.
+    * 
+    * @param name the deployment name
+    * @param defaultKey the fallback profile key
+    * @return the resolved deployment repository
+    * @throws Exception
+    */
+   protected DeploymentRepository resolveDeploymentRepository(String name, ProfileKey defaultKey) throws Exception
+   {
+      for(ProfileKey key : this.profileRepository.getProfileKeys())
+      {
+         DeploymentRepository repository = this.profileRepository.getProfileDeploymentRepository(key);
+         if(repository.getDeploymentNames().contains(name))
+         {
+            return repository;
+         }
+      }
+      return this.profileRepository.getProfileDeploymentRepository(defaultKey);
+   }
+   
+   /**
     * Handle a DeploymentManager invocation other than distribute
     * 
     * @param request - the remoting invocation
@@ -280,12 +311,12 @@
    protected void start(DeploymentID dtID) throws Exception
    {
       String[] names = dtID.getNames();
-      DeploymentRepository deploymentRepository = getDeploymentRepository(dtID);
       log.info("Begin start, "+Arrays.asList(names));
       
       List<String> deployments = new ArrayList<String>(); 
       for(String name : names)
       {
+         DeploymentRepository deploymentRepository = resolveDeploymentRepository(name, dtID.getProfile());
          // Schedule start for the deployment
          deployments.add(start(name, deploymentRepository));
       }
@@ -317,12 +348,12 @@
    protected void stop(DeploymentID dtID) throws Exception
    {
       String[] names = dtID.getNames();
-      DeploymentRepository deploymentRepository = getDeploymentRepository(dtID);
       log.info("Stop, "+Arrays.asList(names));
       
       List<String> deployments = new ArrayList<String>();
       for(String name : names)
       {
+         DeploymentRepository deploymentRepository = resolveDeploymentRepository(name, dtID.getProfile());
          // Schedule stop
          deployments.add(stop(name, deploymentRepository));
       }
@@ -354,11 +385,11 @@
    protected void remove(DeploymentID dtID) throws Exception
    {
       String[] names = dtID.getNames();
-      DeploymentRepository deploymentRepository = getDeploymentRepository(dtID);
       log.info("Remove, "+Arrays.asList(names));
       
       for(String name : names)
       {
+         DeploymentRepository deploymentRepository = resolveDeploymentRepository(name, dtID.getProfile());
          // Remove from repository
          removeDeployment(name, deploymentRepository);
       }

Modified: trunk/testsuite/src/main/org/jboss/test/deployers/test/LegacyDeploymentScannerUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/deployers/test/LegacyDeploymentScannerUnitTestCase.java	2010-01-05 10:22:25 UTC (rev 99020)
+++ trunk/testsuite/src/main/org/jboss/test/deployers/test/LegacyDeploymentScannerUnitTestCase.java	2010-01-05 10:28:12 UTC (rev 99021)
@@ -31,7 +31,6 @@
 import org.jboss.deployers.spi.management.deploy.DeploymentManager;
 import org.jboss.managed.api.ManagedDeployment;
 import org.jboss.profileservice.spi.NoSuchDeploymentException;
-import org.jboss.profileservice.spi.ProfileKey;
 
 /**
  * Test the JBossTools legacy DeploymentScanner usage.
@@ -45,9 +44,6 @@
    /** The deployment scanner MBean name. */
    private static final String DEPLOYMENT_SCANNER_MBEAN = "jboss.deployment:flavor=URL,type=DeploymentScanner";
    
-   /** The scanner profile. */
-   private static final ProfileKey scannerProfile = new ProfileKey("deployment-scanner-profile");
-   
    public static Test suite() throws Exception
    {
       TestSuite suite = new TestSuite();
@@ -143,10 +139,11 @@
    {
       // Test redeploy using deploymentManager
       DeploymentManager deployMgr = getDeploymentManager();
-      deployMgr.loadProfile(scannerProfile);
+      // deployMgr.loadProfile(scannerProfile);
       try
       {
-         redeployCheckComplete(EMTPY_DEPLOYMENT);
+         String name = deployMgr.getRepositoryNames(new String[] { EMTPY_DEPLOYMENT })[0];
+         redeployCheckComplete(name);
       }
       finally
       {