[jboss-cvs] JBossAS SVN: r84598 - in trunk/testsuite/src: main/org/jboss/test/cluster/defaultcfg/test and 6 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sun Feb 22 07:02:29 EST 2009
Author: emuckenhuber
Date: 2009-02-22 07:02:29 -0500 (Sun, 22 Feb 2009)
New Revision: 84598
Modified:
trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/profileservice/test/ClusteredDeployUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/ClusterPartitionManagedObjectsTestCase.java
trunk/testsuite/src/main/org/jboss/test/deployers/AbstractDeploymentTest.java
trunk/testsuite/src/main/org/jboss/test/deployers/client/test/ClientDeploymentUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/profileservice/override/restart/test/JmsDestinationRestartUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/profileservice/override/restart/test/PersistedDataSourceUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/profileservice/override/test/AbstractProfileServiceTest.java
trunk/testsuite/src/main/org/jboss/test/profileservice/override/test/JmsDestinationOverrideTestCase.java
trunk/testsuite/src/main/org/jboss/test/profileservice/override/test/ProfileServiceOverrideTestCase.java
trunk/testsuite/src/main/org/jboss/test/profileservice/test/AbstractProfileServiceTest.java
trunk/testsuite/src/main/org/jboss/test/profileservice/test/DeployUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/profileservice/test/ManagementViewUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/profileservice/test/ProfileServiceUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/profileservice/test/SecurityManagedObjectsTestCase.java
trunk/testsuite/src/main/org/jboss/test/profileservice/test/ServerManagedObjectsTestCase.java
trunk/testsuite/src/resources/test-configs/embedded/conf/bootstrap/profile.xml
Log:
[JBAS-6526] update tests
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 2009-02-22 12:00:34 UTC (rev 84597)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/profileservice/test/ClusteredDeployUnitTestCase.java 2009-02-22 12:02:29 UTC (rev 84598)
@@ -28,14 +28,13 @@
import org.jboss.deployers.spi.management.deploy.DeploymentStatus;
import org.jboss.deployers.spi.management.deploy.ProgressEvent;
import org.jboss.deployers.spi.management.deploy.ProgressListener;
-import org.jboss.managed.api.ManagedDeployment.DeploymentPhase;
import org.jboss.test.profileservice.test.AbstractProfileServiceTest;
/**
* Profile service DeploymentManager tests in a clustered environment
*
* @author Brian Stansberry
- * @version $Revision:$
+ * @version $Revision$
*/
public class ClusteredDeployUnitTestCase extends AbstractProfileServiceTest
implements ProgressListener
@@ -66,7 +65,7 @@
{
DeploymentManager mgtView = getDeploymentManager();
URL contentURL = super.getDeployURL("testWarDeployment.war");
- DeploymentProgress progress = mgtView.distribute("testWarDeployment.war", DeploymentPhase.APPLICATION_TRANSIENT, contentURL);
+ DeploymentProgress progress = mgtView.distribute("testWarDeployment.war", contentURL, true);
assertEquals("DeploymentProgress.getDeploymentTargets", 2, progress.getDeploymentTargets().size());
}
public void testEarDeployment()
@@ -74,7 +73,7 @@
{
DeploymentManager mgtView = getDeploymentManager();
URL contentURL = super.getDeployURL("testEarDeployment.ear");
- DeploymentProgress progress = mgtView.distribute("testEarDeployment.ear", DeploymentPhase.APPLICATION_TRANSIENT, contentURL);
+ DeploymentProgress progress = mgtView.distribute("testEarDeployment.ear", contentURL, true);
assertEquals("DeploymentProgress.getDeploymentTargets", 2, progress.getDeploymentTargets().size());
}
public void testMCBeansDeployment()
@@ -84,7 +83,7 @@
// Distribute the content
DeploymentManager mgtView = getDeploymentManager();
- DeploymentProgress progress = mgtView.distribute("testMCBeansDeployment.beans", DeploymentPhase.APPLICATION_TRANSIENT, contentURL);
+ DeploymentProgress progress = mgtView.distribute("testMCBeansDeployment.beans", contentURL, true);
assertEquals("DeploymentProgress.getDeploymentTargets", 2, progress.getDeploymentTargets().size());
progress.addProgressListener(this);
progress.run();
@@ -96,7 +95,7 @@
// Now start the deployment
String[] names = {"testMCBeansDeployment.beans"};
- progress = mgtView.start(DeploymentPhase.APPLICATION, names);
+ progress = mgtView.start(names);
assertEquals("DeploymentProgress.getDeploymentTargets", 2, progress.getDeploymentTargets().size());
progress.addProgressListener(this);
progress.run();
@@ -110,7 +109,7 @@
{
DeploymentManager mgtView = getDeploymentManager();
URL contentURL = super.getDeployURL("testSarDeployment.sar");
- DeploymentProgress progress = mgtView.distribute("testSarDeployment.sar", DeploymentPhase.APPLICATION, contentURL);
+ DeploymentProgress progress = mgtView.distribute("testSarDeployment.sar", contentURL, true);
assertEquals("DeploymentProgress.getDeploymentTargets", 2, progress.getDeploymentTargets().size());
}
}
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/ClusterPartitionManagedObjectsTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/ClusterPartitionManagedObjectsTestCase.java 2009-02-22 12:00:34 UTC (rev 84597)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/ClusterPartitionManagedObjectsTestCase.java 2009-02-22 12:02:29 UTC (rev 84598)
@@ -34,7 +34,6 @@
import org.jboss.managed.api.ManagedObject;
import org.jboss.managed.api.ManagedOperation;
import org.jboss.managed.api.ManagedProperty;
-import org.jboss.profileservice.spi.ProfileKey;
import org.jboss.profileservice.spi.ProfileService;
import org.jboss.test.JBossClusteredTestCase;
import org.jboss.virtual.VFS;
@@ -43,7 +42,7 @@
* Validates the expected HAPartition-related ManagedObjects are there
*
* @author Brian Stansberry
- * @version $Revision:$
+ * @version $Revision$
*/
public class ClusterPartitionManagedObjectsTestCase
extends JBossClusteredTestCase
@@ -132,11 +131,10 @@
ProfileService ps = (ProfileService) ctx.lookup("ProfileService");
activeView = ps.getViewManager();
- ProfileKey defaultKey = new ProfileKey(profileName);
- activeView.loadProfile(defaultKey);
// Init the VFS to setup the vfs* protocol handlers
VFS.init();
}
+ activeView.load();
return activeView;
}
Modified: trunk/testsuite/src/main/org/jboss/test/deployers/AbstractDeploymentTest.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/deployers/AbstractDeploymentTest.java 2009-02-22 12:00:34 UTC (rev 84597)
+++ trunk/testsuite/src/main/org/jboss/test/deployers/AbstractDeploymentTest.java 2009-02-22 12:02:29 UTC (rev 84598)
@@ -140,7 +140,7 @@
String[] names = jarNames.split(",");
for (String name : names)
{
- DeploymentProgress distribute = getDeploymentManager().distribute(name, ManagedDeployment.DeploymentPhase.APPLICATION, getManagedURL(name), copyContent);
+ DeploymentProgress distribute = getDeploymentManager().distribute(name, getManagedURL(name), copyContent);
//distribute.addProgressListener(LOG_PROGRESS_LISTENER);
distribute.run();
checkProgress(distribute);
@@ -148,7 +148,12 @@
deploymentNames.addAll(Arrays.asList(distribute.getDeploymentID().getRepositoryNames()));
}
- DeploymentProgress start = getDeploymentManager().start(ManagedDeployment.DeploymentPhase.APPLICATION, deploymentNames.toArray(new String[ deploymentNames.size()]));
+ // Check the resolution of repository names
+ assertTrue("resolve repsoitory names",
+ Arrays.asList(getDeploymentManager().getRepositoryNames(names)).containsAll(deploymentNames));
+
+
+ DeploymentProgress start = getDeploymentManager().start(deploymentNames.toArray(new String[ deploymentNames.size()]));
start.run();
checkProgress(start);
@@ -167,11 +172,11 @@
if (jarNames == null)
return;
- DeploymentProgress stop = getDeploymentManager().stop(ManagedDeployment.DeploymentPhase.APPLICATION, deploymentNames.toArray(new String[ deploymentNames.size()]));
+ DeploymentProgress stop = getDeploymentManager().stop(deploymentNames.toArray(new String[ deploymentNames.size()]));
stop.run();
checkProgress(stop);
- DeploymentProgress undeploy = getDeploymentManager().undeploy(ManagedDeployment.DeploymentPhase.APPLICATION, deploymentNames.toArray(new String[ deploymentNames.size()]));
+ DeploymentProgress undeploy = getDeploymentManager().remove(deploymentNames.toArray(new String[ deploymentNames.size()]));
undeploy.run();
checkProgress(undeploy);
@@ -247,12 +252,10 @@
protected ManagementView getManagementView() throws Exception
{
- String profileName = getProfileName();
InitialContext ctx = getInitialContext();
ProfileService ps = (ProfileService)ctx.lookup("ProfileService");
ManagementView activeView = ps.getViewManager();
- ProfileKey defaultKey = new ProfileKey(profileName);
- activeView.loadProfile(defaultKey);
+ activeView.load();
// Init the VFS to setup the vfs* protocol handlers
VFS.init();
return activeView;
@@ -261,7 +264,7 @@
protected ManagedDeployment getDeploymentUnit(String deployment) throws Exception
{
ManagementView mv = getManagementView();
- return mv.getDeployment(deployment, ManagedDeployment.DeploymentPhase.APPLICATION);
+ return mv.getDeployment(deployment);
}
protected ManagedDeployment assertDeployed(String deployment) throws Exception
@@ -289,7 +292,7 @@
protected boolean isDeployed(String deployment) throws Exception
{
ManagementView mv = getManagementView();
- ManagedDeployment md = mv.getDeployment(deployment, ManagedDeployment.DeploymentPhase.APPLICATION);
+ ManagedDeployment md = mv.getDeployment(deployment);
return (md != null);
}
Modified: trunk/testsuite/src/main/org/jboss/test/deployers/client/test/ClientDeploymentUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/deployers/client/test/ClientDeploymentUnitTestCase.java 2009-02-22 12:00:34 UTC (rev 84597)
+++ trunk/testsuite/src/main/org/jboss/test/deployers/client/test/ClientDeploymentUnitTestCase.java 2009-02-22 12:02:29 UTC (rev 84598)
@@ -24,6 +24,7 @@
import java.util.HashSet;
import junit.framework.Test;
+
import org.jboss.test.deployers.AbstractDeploymentTest;
/**
Modified: trunk/testsuite/src/main/org/jboss/test/profileservice/override/restart/test/JmsDestinationRestartUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/profileservice/override/restart/test/JmsDestinationRestartUnitTestCase.java 2009-02-22 12:00:34 UTC (rev 84597)
+++ trunk/testsuite/src/main/org/jboss/test/profileservice/override/restart/test/JmsDestinationRestartUnitTestCase.java 2009-02-22 12:02:29 UTC (rev 84598)
@@ -25,7 +25,6 @@
import org.jboss.managed.api.ManagedComponent;
import org.jboss.managed.api.ManagedDeployment;
import org.jboss.managed.api.ManagedProperty;
-import org.jboss.managed.api.ManagedDeployment.DeploymentPhase;
import org.jboss.metatype.api.values.SimpleValueSupport;
import org.jboss.test.profileservice.override.test.AbstractProfileServiceTest;
@@ -53,7 +52,7 @@
{
ManagementView mgtView = getManagementView();
- ManagedDeployment md = mgtView.getDeployment(deploymentName, DeploymentPhase.APPLICATION);
+ ManagedDeployment md = mgtView.getDeployment(deploymentName);
assertNotNull(md);
ManagedComponent component = md.getComponent("testQueue");
@@ -80,7 +79,7 @@
try
{
ManagementView mgtView = getManagementView();
- ManagedDeployment md = mgtView.getDeployment(deploymentName, DeploymentPhase.APPLICATION);
+ ManagedDeployment md = mgtView.getDeployment(deploymentName);
assertNotNull(md);
ManagedComponent component = md.getComponent("testTopic");
Modified: trunk/testsuite/src/main/org/jboss/test/profileservice/override/restart/test/PersistedDataSourceUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/profileservice/override/restart/test/PersistedDataSourceUnitTestCase.java 2009-02-22 12:00:34 UTC (rev 84597)
+++ trunk/testsuite/src/main/org/jboss/test/profileservice/override/restart/test/PersistedDataSourceUnitTestCase.java 2009-02-22 12:02:29 UTC (rev 84598)
@@ -25,7 +25,6 @@
import org.jboss.managed.api.ManagedComponent;
import org.jboss.managed.api.ManagedDeployment;
import org.jboss.managed.api.ManagedProperty;
-import org.jboss.managed.api.ManagedDeployment.DeploymentPhase;
import org.jboss.metatype.api.values.SimpleValueSupport;
import org.jboss.test.profileservice.override.test.AbstractProfileServiceTest;
@@ -57,7 +56,7 @@
// deployPackage(deploymentName);
ManagementView mgtView = getManagementView();
- ManagedDeployment md = mgtView.getDeployment(deploymentName, DeploymentPhase.APPLICATION);
+ ManagedDeployment md = mgtView.getDeployment(deploymentName);
assertNotNull(md);
ManagedComponent mc = md.getComponent("ChangedDsJNDIName");
@@ -92,7 +91,7 @@
{
// deployPackage(deploymentName);
ManagementView mgtView = getManagementView();
- ManagedDeployment deployment = mgtView.getDeployment(deploymentName, DeploymentPhase.APPLICATION);
+ ManagedDeployment deployment = mgtView.getDeployment(deploymentName);
assertNotNull(deployment);
assertNotNull(deployment.getChildren());
Modified: trunk/testsuite/src/main/org/jboss/test/profileservice/override/test/AbstractProfileServiceTest.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/profileservice/override/test/AbstractProfileServiceTest.java 2009-02-22 12:00:34 UTC (rev 84597)
+++ trunk/testsuite/src/main/org/jboss/test/profileservice/override/test/AbstractProfileServiceTest.java 2009-02-22 12:02:29 UTC (rev 84598)
@@ -34,7 +34,6 @@
import org.jboss.deployers.spi.management.deploy.ProgressListener;
import org.jboss.managed.api.ComponentType;
import org.jboss.managed.api.ManagedComponent;
-import org.jboss.managed.api.ManagedDeployment.DeploymentPhase;
import org.jboss.profileservice.spi.ProfileKey;
import org.jboss.profileservice.spi.ProfileService;
import org.jboss.test.JBossTestCase;
@@ -129,12 +128,10 @@
protected ManagementView getManagementView()
throws Exception
{
- String profileName = getProfileName();
InitialContext ctx = getInitialContext();
ProfileService ps = (ProfileService) ctx.lookup("ProfileService");
ManagementView activeView = ps.getViewManager();
- ProfileKey defaultKey = new ProfileKey(profileName);
- activeView.loadProfile(defaultKey);
+ activeView.load();
// Init the VFS to setup the vfs* protocol handlers
VFS.init();
return activeView;
@@ -165,7 +162,7 @@
protected String[] distribute(DeploymentManager deployMgr, String name, URL contentURL)
throws Exception
{
- DeploymentProgress progress = deployMgr.distribute(name, DeploymentPhase.APPLICATION, contentURL, true);
+ DeploymentProgress progress = deployMgr.distribute(name, contentURL, true);
getLog().debug("distribute: "+ contentURL);
progress.addProgressListener(this);
progress.run();
@@ -177,7 +174,7 @@
protected void start(DeploymentManager deployMgr, String[] repositoryNames) throws Exception
{
- DeploymentProgress progress = deployMgr.start(DeploymentPhase.APPLICATION, repositoryNames);
+ DeploymentProgress progress = deployMgr.start(repositoryNames);
progress.addProgressListener(this);
progress.run();
@@ -187,7 +184,7 @@
protected void stop(DeploymentManager deployMgr, String[] repositoryNames) throws Exception
{
- DeploymentProgress progress = deployMgr.stop(DeploymentPhase.APPLICATION, repositoryNames);
+ DeploymentProgress progress = deployMgr.stop(repositoryNames);
progress.addProgressListener(this);
progress.run();
@@ -197,7 +194,7 @@
protected void undeploy(DeploymentManager deployMgr, String[] repositoryNames) throws Exception
{
- DeploymentProgress progress = deployMgr.undeploy(DeploymentPhase.APPLICATION, repositoryNames);
+ DeploymentProgress progress = deployMgr.remove(repositoryNames);
progress.addProgressListener(this);
progress.run();
Modified: trunk/testsuite/src/main/org/jboss/test/profileservice/override/test/JmsDestinationOverrideTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/profileservice/override/test/JmsDestinationOverrideTestCase.java 2009-02-22 12:00:34 UTC (rev 84597)
+++ trunk/testsuite/src/main/org/jboss/test/profileservice/override/test/JmsDestinationOverrideTestCase.java 2009-02-22 12:02:29 UTC (rev 84598)
@@ -25,7 +25,6 @@
import org.jboss.managed.api.ManagedComponent;
import org.jboss.managed.api.ManagedDeployment;
import org.jboss.managed.api.ManagedProperty;
-import org.jboss.managed.api.ManagedDeployment.DeploymentPhase;
import org.jboss.metatype.api.values.SimpleValueSupport;
/**
@@ -53,7 +52,7 @@
deployPackage(deploymentName);
ManagementView mgtView = getManagementView();
- ManagedDeployment md = mgtView.getDeployment(deploymentName, DeploymentPhase.APPLICATION);
+ ManagedDeployment md = mgtView.getDeployment(deploymentName);
assertNotNull(md);
ManagedComponent component = md.getComponent("testQueue");
@@ -85,7 +84,7 @@
deployPackage(deploymentName);
ManagementView mgtView = getManagementView();
- ManagedDeployment md = mgtView.getDeployment(deploymentName, DeploymentPhase.APPLICATION);
+ ManagedDeployment md = mgtView.getDeployment(deploymentName);
assertNotNull(md);
ManagedComponent component = md.getComponent("testTopic");
Modified: trunk/testsuite/src/main/org/jboss/test/profileservice/override/test/ProfileServiceOverrideTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/profileservice/override/test/ProfileServiceOverrideTestCase.java 2009-02-22 12:00:34 UTC (rev 84597)
+++ trunk/testsuite/src/main/org/jboss/test/profileservice/override/test/ProfileServiceOverrideTestCase.java 2009-02-22 12:02:29 UTC (rev 84598)
@@ -25,8 +25,6 @@
import org.jboss.managed.api.ManagedComponent;
import org.jboss.managed.api.ManagedDeployment;
import org.jboss.managed.api.ManagedProperty;
-import org.jboss.managed.api.ManagedDeployment.DeploymentPhase;
-import org.jboss.metatype.api.values.CollectionValue;
import org.jboss.metatype.api.values.CompositeValue;
import org.jboss.metatype.api.values.SimpleValueSupport;
@@ -58,7 +56,7 @@
deployPackage(deploymentName);
ManagementView mgtView = getManagementView();
- ManagedDeployment md = mgtView.getDeployment(deploymentName, DeploymentPhase.APPLICATION);
+ ManagedDeployment md = mgtView.getDeployment(deploymentName);
assertNotNull(md);
ManagedComponent mc = md.getComponent("ProfileServiceTestDS");
@@ -96,7 +94,7 @@
// See if the changes are reflected in the managedView after a reload
mgtView = getManagementView();
- ManagedDeployment md2 = mgtView.getDeployment(deploymentName, DeploymentPhase.APPLICATION);
+ ManagedDeployment md2 = mgtView.getDeployment(deploymentName);
assertNotNull(md2);
ManagedComponent mc2 = md2.getComponent("ChangedDsJNDIName");
@@ -131,7 +129,7 @@
{
deployPackage(deploymentName);
ManagementView mgtView = getManagementView();
- ManagedDeployment deployment = mgtView.getDeployment(deploymentName, DeploymentPhase.APPLICATION);
+ ManagedDeployment deployment = mgtView.getDeployment(deploymentName);
assertNotNull(deployment);
assertNotNull(deployment.getChildren());
Modified: trunk/testsuite/src/main/org/jboss/test/profileservice/test/AbstractProfileServiceTest.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/profileservice/test/AbstractProfileServiceTest.java 2009-02-22 12:00:34 UTC (rev 84597)
+++ trunk/testsuite/src/main/org/jboss/test/profileservice/test/AbstractProfileServiceTest.java 2009-02-22 12:02:29 UTC (rev 84598)
@@ -29,10 +29,10 @@
import org.jboss.deployers.spi.management.ManagementView;
import org.jboss.deployers.spi.management.deploy.DeploymentManager;
+import org.jboss.deployers.spi.management.deploy.DeploymentProgress;
import org.jboss.managed.api.ComponentType;
import org.jboss.managed.api.DeploymentTemplateInfo;
import org.jboss.managed.api.ManagedComponent;
-import org.jboss.managed.api.ManagedDeployment;
import org.jboss.managed.api.ManagedProperty;
import org.jboss.metatype.api.values.MetaValue;
import org.jboss.metatype.api.values.MetaValueFactory;
@@ -69,12 +69,18 @@
protected void removeDeployment(String deployment)
throws Exception
{
- ManagementView mgtView = getManagementView();
- Set<String> names = mgtView.getMatchingDeploymentName(".*" + deployment);
- assertEquals("1 matching name", 1, names.size());
- String deploymentName = names.iterator().next();
- mgtView.removeDeployment(deploymentName, ManagedDeployment.DeploymentPhase.APPLICATION);
- mgtView.process();
+ String names[] = new String[] {deployment};
+ DeploymentManager deployMgr = getDeploymentManager();
+ try
+ {
+ DeploymentProgress progress = deployMgr.stop(names);
+ progress.run();
+ }
+ finally
+ {
+ DeploymentProgress progress = deployMgr.remove(names);
+ progress.run();
+ }
}
protected void createComponentTest(String templateName,
@@ -95,7 +101,7 @@
prop.setValue(propValues.get(propName));
}
- mgtView.applyTemplate(ManagedDeployment.DeploymentPhase.APPLICATION, deploymentName, info);
+ mgtView.applyTemplate(deploymentName, info);
mgtView.process();
// reload the view
@@ -139,7 +145,7 @@
VFS.init();
}
// Reload
- activeView.loadProfile(getProfileKey());
+ activeView.load();
return activeView;
}
/**
Modified: trunk/testsuite/src/main/org/jboss/test/profileservice/test/DeployUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/profileservice/test/DeployUnitTestCase.java 2009-02-22 12:00:34 UTC (rev 84597)
+++ trunk/testsuite/src/main/org/jboss/test/profileservice/test/DeployUnitTestCase.java 2009-02-22 12:02:29 UTC (rev 84598)
@@ -24,12 +24,9 @@
import java.net.URL;
import java.util.Arrays;
import java.util.Set;
+
import javax.naming.InitialContext;
-import junit.extensions.TestSetup;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.jboss.deployers.spi.management.ManagementView;
import org.jboss.deployers.spi.management.deploy.DeploymentManager;
import org.jboss.deployers.spi.management.deploy.DeploymentProgress;
@@ -37,11 +34,7 @@
import org.jboss.deployers.spi.management.deploy.ProgressEvent;
import org.jboss.deployers.spi.management.deploy.ProgressListener;
import org.jboss.managed.api.ManagedDeployment;
-import org.jboss.managed.api.ManagedDeployment.DeploymentPhase;
import org.jboss.profileservice.spi.ProfileKey;
-import org.jboss.profileservice.spi.ProfileService;
-import org.jboss.test.JBossTestSetup;
-import org.jboss.test.jpa.test.WebClassesEARJPAUnitTestCase;
import org.jboss.test.profileservice.ejb2x.BeanHome;
import org.jboss.test.profileservice.ejb2x.BeanRemote;
import org.jboss.test.profileservice.ejb3x.BeanRemote3x;
@@ -49,7 +42,7 @@
/**
* Profile service DeploymentManager tests
* @author Scott.Stark at jboss.org
- * @version $Revision:$
+ * @version $Revision$
*/
public class DeployUnitTestCase extends AbstractProfileServiceTest implements ProgressListener
{
@@ -108,7 +101,7 @@
getLog().debug(contentURL);
DeploymentStatus status;
- DeploymentProgress progress = deployMgr.distribute(name, DeploymentPhase.APPLICATION, contentURL);
+ DeploymentProgress progress = deployMgr.distribute(name, contentURL, true);
progress.addProgressListener(this);
progress.run();
String[] uploadedNames = {};
@@ -124,7 +117,7 @@
uploadedNames = progress.getDeploymentID().getRepositoryNames();
getLog().debug("Uploaded deployment names: "+Arrays.asList(uploadedNames));
// Now start the deployment
- progress = deployMgr.start(DeploymentPhase.APPLICATION, uploadedNames);
+ progress = deployMgr.start(uploadedNames);
progress.addProgressListener(this);
progress.run();
try
@@ -135,7 +128,7 @@
assertFalse("DeploymentStatus.isFailed: " + status, status.isFailed());
// Check for a
ManagementView mgtView = getManagementView();
- ManagedDeployment deployment = mgtView.getDeployment(uploadedNames[0], DeploymentPhase.APPLICATION);
+ ManagedDeployment deployment = mgtView.getDeployment(uploadedNames[0]);
assertNotNull(deployment);
getLog().info("Found " + type + " deployment: " + deployment);
Set<String> types = deployment.getTypes();
@@ -151,7 +144,7 @@
//Thread.sleep(15 * 1000); // 15 secs >> more than it takes for reaper to run :-)
// Stop/remove the deployment
- progress = deployMgr.stop(DeploymentPhase.APPLICATION, uploadedNames);
+ progress = deployMgr.stop(uploadedNames);
progress.addProgressListener(this);
progress.run();
status = progress.getDeploymentStatus();
@@ -161,7 +154,7 @@
}
finally
{
- progress = deployMgr.undeploy(DeploymentPhase.APPLICATION, uploadedNames);
+ progress = deployMgr.remove(uploadedNames);
progress.addProgressListener(this);
progress.run();
status = progress.getDeploymentStatus();
Modified: trunk/testsuite/src/main/org/jboss/test/profileservice/test/ManagementViewUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/profileservice/test/ManagementViewUnitTestCase.java 2009-02-22 12:00:34 UTC (rev 84597)
+++ trunk/testsuite/src/main/org/jboss/test/profileservice/test/ManagementViewUnitTestCase.java 2009-02-22 12:02:29 UTC (rev 84598)
@@ -60,7 +60,7 @@
{
for(String deploymentName : deploymentNames)
{
- mgtView.getDeployment(deploymentName, null);
+ mgtView.getDeployment(deploymentName);
}
}
}
Modified: trunk/testsuite/src/main/org/jboss/test/profileservice/test/ProfileServiceUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/profileservice/test/ProfileServiceUnitTestCase.java 2009-02-22 12:00:34 UTC (rev 84597)
+++ trunk/testsuite/src/main/org/jboss/test/profileservice/test/ProfileServiceUnitTestCase.java 2009-02-22 12:02:29 UTC (rev 84598)
@@ -40,6 +40,7 @@
import org.jboss.deployers.spi.management.KnownComponentTypes;
import org.jboss.deployers.spi.management.KnownDeploymentTypes;
import org.jboss.deployers.spi.management.ManagementView;
+import org.jboss.deployers.spi.management.deploy.DeploymentManager;
import org.jboss.managed.api.ComponentType;
import org.jboss.managed.api.DeploymentTemplateInfo;
import org.jboss.managed.api.ManagedComponent;
@@ -48,7 +49,6 @@
import org.jboss.managed.api.ManagedOperation;
import org.jboss.managed.api.ManagedProperty;
import org.jboss.managed.api.RunState;
-import org.jboss.managed.api.ManagedDeployment.DeploymentPhase;
import org.jboss.managed.api.annotation.ManagementProperty;
import org.jboss.managed.api.annotation.ViewUse;
import org.jboss.metatype.api.types.GenericMetaType;
@@ -175,7 +175,7 @@
"conf/bootstrap/classloader.xml",
"conf/bootstrap/deployers.xml",
"conf/bootstrap/jmx.xml",
- "conf/bootstrap/profile-service.xml",
+ "conf/bootstrap/profile.xml",
"conf/jboss-service.xml",
"deployers/jbossweb.deployer/",
"deployers/ear-deployer-jboss-beans.xml",
@@ -216,7 +216,7 @@
Set<String> names = mgtView.getDeploymentNames();
for(String name : names)
{
- ManagedDeployment deployment = mgtView.getDeployment(name, null);
+ ManagedDeployment deployment = mgtView.getDeployment(name);
log.info(deployment);
}
}
@@ -273,11 +273,11 @@
public void testNoSuchProfileException()
throws Exception
{
- ManagementView mgtView = getManagementView();
+ DeploymentManager deployMgr = getDeploymentManager();
ProfileKey badKey = new ProfileKey("no-such-profile");
try
{
- mgtView.loadProfile(badKey);
+ deployMgr.loadProfile(badKey, false);
fail("Did not see NoSuchProfileException");
}
catch(NoSuchProfileException e)
@@ -568,7 +568,6 @@
throws Exception
{
ManagementView mgtView = getManagementView();
- mgtView.reloadProfile();
ComponentType type = new ComponentType("DataSource", "LocalTx");
ManagedComponent hsqldb = mgtView.getComponent("DefaultDS", type);
Map<String,ManagedProperty> props = hsqldb.getProperties();
@@ -654,7 +653,7 @@
{
String jndiName = "TestLocalTxDs";
Map<String, MetaValue> propValues = new HashMap<String, MetaValue>();
- propValues.put("track-connection-by-tx", SimpleValueSupport.wrap(Boolean.FALSE));
+ propValues.put("track-connection-by-tx", SimpleValueSupport.wrap(Boolean.TRUE));
addNonXaDsProperties(propValues, jndiName, "jboss-local-jdbc.rar", "javax.sql.DataSource");
createComponentTest("LocalTxDataSourceTemplate", propValues, "testLocalTxDs",
KnownComponentTypes.DataSourceTypes.LocalTx.getType(), jndiName);
@@ -793,6 +792,7 @@
MetaValue metaValue = this.compositeValueMap(xaProps);
propValues.put("config-property", metaValue);
+ propValues.put("track-connection-by-tx", SimpleValueSupport.wrap(Boolean.TRUE));
// todo: how to set the specific domain?
//ApplicationManagedSecurityMetaData secDomain = new ApplicationManagedSecurityMetaData();
//props.get("security-domain").setValue(secDomain);
@@ -923,8 +923,8 @@
prop.setValue(propValues.get(propName));
log.debug("template property after: "+prop.getName()+","+prop.getValue());
}
-
- mgtView.applyTemplate(DeploymentPhase.APPLICATION, deploymentName, dsInfo);
+
+ mgtView.applyTemplate(deploymentName, dsInfo);
mgtView.process();
// reload the view
Modified: trunk/testsuite/src/main/org/jboss/test/profileservice/test/SecurityManagedObjectsTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/profileservice/test/SecurityManagedObjectsTestCase.java 2009-02-22 12:00:34 UTC (rev 84597)
+++ trunk/testsuite/src/main/org/jboss/test/profileservice/test/SecurityManagedObjectsTestCase.java 2009-02-22 12:02:29 UTC (rev 84598)
@@ -38,7 +38,6 @@
import org.jboss.managed.api.ManagedOperation;
import org.jboss.managed.api.ManagedParameter;
import org.jboss.managed.api.ManagedProperty;
-import org.jboss.managed.api.ManagedDeployment.DeploymentPhase;
/**
* <p>
@@ -305,9 +304,8 @@
// validate the managed deployment.
ManagementView managementView = getManagementView();
- managementView.reloadProfile();
- ManagedDeployment deployment = managementView.getDeployment(domainsDeployment, DeploymentPhase.APPLICATION);
+ ManagedDeployment deployment = managementView.getDeployment(domainsDeployment);
assertNotNull(deployment);
// verify the deployment contains the expected managed components.
assertEquals("Unexpected number of components", 2, deployment.getComponents().size());
@@ -421,7 +419,7 @@
// distribute the resource deployment.
DeploymentManager manager = super.getDeploymentManager();
- DeploymentProgress progress = manager.distribute(resourceName, DeploymentPhase.APPLICATION, contentURL, true);
+ DeploymentProgress progress = manager.distribute(resourceName, contentURL, true);
progress.addProgressListener(this.listener);
progress.run();
@@ -429,7 +427,7 @@
// start the deployment.
String[] uploadedNames = progress.getDeploymentID().getRepositoryNames();
- progress = manager.start(DeploymentPhase.APPLICATION, uploadedNames);
+ progress = manager.start(uploadedNames);
progress.addProgressListener(this.listener);
progress.run();
@@ -457,12 +455,12 @@
{
// stop the resource deployment.
DeploymentManager manager = super.getDeploymentManager();
- DeploymentProgress progress = manager.stop(DeploymentPhase.APPLICATION, resourceName);
+ DeploymentProgress progress = manager.stop(resourceName);
progress.addProgressListener(this.listener);
progress.run();
// undeploy the resource.
- progress = manager.undeploy(DeploymentPhase.APPLICATION, resourceName);
+ progress = manager.remove(resourceName);
progress.addProgressListener(this.listener);
progress.run();
}
Modified: trunk/testsuite/src/main/org/jboss/test/profileservice/test/ServerManagedObjectsTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/profileservice/test/ServerManagedObjectsTestCase.java 2009-02-22 12:00:34 UTC (rev 84597)
+++ trunk/testsuite/src/main/org/jboss/test/profileservice/test/ServerManagedObjectsTestCase.java 2009-02-22 12:02:29 UTC (rev 84598)
@@ -31,7 +31,6 @@
import org.jboss.managed.api.ComponentType;
import org.jboss.managed.api.ManagedComponent;
import org.jboss.managed.api.ManagedDeployment;
-import org.jboss.managed.api.ManagedDeployment.DeploymentPhase;
import org.jboss.managed.api.ManagedProperty;
import org.jboss.metatype.api.types.EnumMetaType;
import org.jboss.metatype.api.values.EnumValue;
@@ -116,7 +115,7 @@
ManagedDeployment md = mc.getDeployment();
assertNotNull(md);
getLog().info(md);
- ManagedDeployment bootstrapMD = mgtView.getDeployment(md.getName(), DeploymentPhase.BOOTSTRAP);
+ ManagedDeployment bootstrapMD = mgtView.getDeployment(md.getName());
assertNotNull(bootstrapMD);
// Validate properties, [buildOS, buildID, config, buildNumber, startDate, buildDate, versionName, buildJVM, versionNumber, version]
@@ -172,10 +171,10 @@
ProfileService ps = (ProfileService) ctx.lookup("ProfileService");
activeView = ps.getViewManager();
ProfileKey defaultKey = new ProfileKey(profileName);
- activeView.loadProfile(defaultKey);
// Init the VFS to setup the vfs* protocol handlers
VFS.init();
}
+ activeView.load();
return activeView;
}
Modified: trunk/testsuite/src/resources/test-configs/embedded/conf/bootstrap/profile.xml
===================================================================
--- trunk/testsuite/src/resources/test-configs/embedded/conf/bootstrap/profile.xml 2009-02-22 12:00:34 UTC (rev 84597)
+++ trunk/testsuite/src/resources/test-configs/embedded/conf/bootstrap/profile.xml 2009-02-22 12:02:29 UTC (rev 84598)
@@ -50,14 +50,7 @@
</bean>
<!-- The default deployment repository factory -->
- <bean name="DefaultDeploymentRepositoryFactory" class="org.jboss.system.server.profileservice.repository.FilteredDeploymentRepositoryFactory">
- <property name="attachmentStore"><inject bean="AttachmentStore" /></property>
- <!--
- <property name="mainDeployer"><inject bean="MainDeployer" /></property>
- <property name="deploymentFilter"><inject bean="DeploymentFilter" /></property>
- <property name="hotDeploymentFilter"><bean class="org.jboss.system.server.profile.basic.XmlIncludeVirtualFileFilter" /></property>
- -->
- </bean>
+ <bean name="DefaultDeploymentRepositoryFactory" class="org.jboss.system.server.profileservice.repository.FilteredDeploymentRepositoryFactory" />
<!-- The attachment store -->
<bean name="AttachmentStore" class="org.jboss.system.server.profileservice.repository.AbstractAttachmentStore">
More information about the jboss-cvs-commits
mailing list