[jboss-cvs] JBossAS SVN: r74208 - in trunk: system/src/main/org/jboss/system/server/profileservice/repository and 1 other directories.

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

Author: scott.stark at jboss.org
Date: 2008-06-05 18:44:54 -0400 (Thu, 05 Jun 2008)
New Revision: 74208

Modified:
   trunk/component-matrix/pom.xml
   trunk/system/src/main/org/jboss/system/server/profileservice/repository/SerializableDeploymentRepository.java
   trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/profileservice/test/ClusteredDeployUnitTestCase.java
Log:
Update version.org.jboss.man to 2.0.0.Beta14 to change APPLICATION_CLUSTERED to APPLICATION_TRANSIENT

Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml	2008-06-05 22:43:02 UTC (rev 74207)
+++ trunk/component-matrix/pom.xml	2008-06-05 22:44:54 UTC (rev 74208)
@@ -44,7 +44,7 @@
     <version.org.jboss.cluster>1.1.0.CR1</version.org.jboss.cluster>
     <version.org.jboss.deployers>2.0.0.Beta15</version.org.jboss.deployers>
     <version.org.jboss.integration>5.0.0.Beta5</version.org.jboss.integration>
-    <version.org.jboss.man>2.0.0.Beta13</version.org.jboss.man>
+    <version.org.jboss.man>2.0.0.Beta14</version.org.jboss.man>
     <version.org.jboss.microcontainer>2.0.0.Beta14</version.org.jboss.microcontainer>
     <version.org.jboss.security>2.0.2.CR2</version.org.jboss.security>
     <version.oswego-concurrent.concurrent>1.3.4-jboss-update1</version.oswego-concurrent.concurrent>

Modified: trunk/system/src/main/org/jboss/system/server/profileservice/repository/SerializableDeploymentRepository.java
===================================================================
--- trunk/system/src/main/org/jboss/system/server/profileservice/repository/SerializableDeploymentRepository.java	2008-06-05 22:43:02 UTC (rev 74207)
+++ trunk/system/src/main/org/jboss/system/server/profileservice/repository/SerializableDeploymentRepository.java	2008-06-05 22:44:54 UTC (rev 74208)
@@ -287,7 +287,7 @@
          case APPLICATION:
             this.addApplication(vfsPath, d);
             break;
-         case APPLICATION_CLUSTERED:
+         case APPLICATION_TRANSIENT:
             this.addApplication(vfsPath, d);
             break;
       }
@@ -647,7 +647,7 @@
          case APPLICATION:
             uri = getApplicationURI();
             break;
-         case APPLICATION_CLUSTERED:
+         case APPLICATION_TRANSIENT:
             // TODO
             break;
       }

Modified: trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/profileservice/test/ClusteredDeployUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/profileservice/test/ClusteredDeployUnitTestCase.java	2008-06-05 22:43:02 UTC (rev 74207)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/profileservice/test/ClusteredDeployUnitTestCase.java	2008-06-05 22:44:54 UTC (rev 74208)
@@ -66,7 +66,7 @@
    {
       DeploymentManager mgtView = getDeploymentManager();
       URL contentURL = super.getDeployURL("testWarDeployment.war");
-      DeploymentProgress progress = mgtView.distribute("testWarDeployment.war", DeploymentPhase.APPLICATION_CLUSTERED, contentURL);
+      DeploymentProgress progress = mgtView.distribute("testWarDeployment.war", DeploymentPhase.APPLICATION_TRANSIENT, contentURL);
       assertEquals("DeploymentProgress.getDeploymentTargets", 2, progress.getDeploymentTargets().size());
    }
    public void testEarDeployment()
@@ -74,7 +74,7 @@
    {
       DeploymentManager mgtView = getDeploymentManager();
       URL contentURL = super.getDeployURL("testEarDeployment.ear");
-      DeploymentProgress progress = mgtView.distribute("testEarDeployment.ear", DeploymentPhase.APPLICATION_CLUSTERED, contentURL);
+      DeploymentProgress progress = mgtView.distribute("testEarDeployment.ear", DeploymentPhase.APPLICATION_TRANSIENT, contentURL);
       assertEquals("DeploymentProgress.getDeploymentTargets", 2, progress.getDeploymentTargets().size());
    }
    public void testMCBeansDeployment()
@@ -84,7 +84,7 @@
 
       // Distribute the content
       DeploymentManager mgtView = getDeploymentManager();
-      DeploymentProgress progress = mgtView.distribute("testMCBeansDeployment.beans", DeploymentPhase.APPLICATION_CLUSTERED, contentURL);
+      DeploymentProgress progress = mgtView.distribute("testMCBeansDeployment.beans", DeploymentPhase.APPLICATION_TRANSIENT, contentURL);
       assertEquals("DeploymentProgress.getDeploymentTargets", 2, progress.getDeploymentTargets().size());
       progress.addProgressListener(this);
       progress.run();