[jboss-cvs] JBossAS SVN: r102414 - in projects/profileservice/trunk: core/src/main/java/org/jboss/profileservice/management and 10 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Mar 15 12:28:27 EDT 2010
Author: emuckenhuber
Date: 2010-03-15 12:28:25 -0400 (Mon, 15 Mar 2010)
New Revision: 102414
Modified:
projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/deployment/AbstractProfileDeployment.java
projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/management/AbstractActionController.java
projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/metadata/ProfileMetaDataFactory.java
projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/virtual/assembly/AbstractVirtualAssemblyContext.java
projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/virtual/assembly/BasicVirtualAssemblyContext.java
projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/virtual/assembly/ImmutableAssemblyContext.java
projects/profileservice/trunk/core/src/test/java/org/jboss/test/profileservice/deployment/test/HDScannerUnitTestCase.java
projects/profileservice/trunk/core/src/test/java/org/jboss/test/profileservice/metadata/test/AbstractProfileServiceMetaDataTest.java
projects/profileservice/trunk/core/src/test/java/org/jboss/test/profileservice/metadata/test/BasicDomainMetaDataUnitTestCase.java
projects/profileservice/trunk/core/src/test/java/org/jboss/test/profileservice/repository/test/ArtifactRepositoryUnitTestCase.java
projects/profileservice/trunk/core/src/test/java/org/jboss/test/profileservice/test/BasicProfileServiceUnitTestCase.java
projects/profileservice/trunk/core/src/test/java/org/jboss/test/profileservice/virtual/test/StructureMetaDataUnitTestCase.java
projects/profileservice/trunk/plugins/src/main/java/org/jboss/profileservice/plugins/deploy/AbstractDeployHandler.java
projects/profileservice/trunk/plugins/src/test/java/org/jboss/test/profileservice/plugins/deploy/support/DeployHandlerSupport.java
projects/profileservice/trunk/plugins/src/test/java/org/jboss/test/profileservice/plugins/deploy/test/TransientProfileUnitTestCase.java
Log:
test updates.
Modified: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/deployment/AbstractProfileDeployment.java
===================================================================
--- projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/deployment/AbstractProfileDeployment.java 2010-03-15 16:10:39 UTC (rev 102413)
+++ projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/deployment/AbstractProfileDeployment.java 2010-03-15 16:28:25 UTC (rev 102414)
@@ -170,7 +170,6 @@
{
cleanup(getPredeterminedAttachments());
cleanup(getTransientAttachments());
-
}
protected void cleanup(DeploymentAttachments attachments)
Modified: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/management/AbstractActionController.java
===================================================================
--- projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/management/AbstractActionController.java 2010-03-15 16:10:39 UTC (rev 102413)
+++ projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/management/AbstractActionController.java 2010-03-15 16:28:25 UTC (rev 102414)
@@ -83,6 +83,10 @@
public void addProfile(ManagedProfile context)
{
ProfileKey key = context.getProfileKey();
+ if(profiles.contains(key))
+ {
+ throw new IllegalArgumentException("duplicate profile " + key);
+ }
this.profiles.add(key);
this.profilesByName.put(key, new ProfileWrapper(context));
fireModificationEvent(new ProfileLifeCycleEvent(key, LifeCycleState.INSTALLED));
@@ -224,9 +228,9 @@
{
boolean success = true;
final List<TwoPhaseCommitProfileAction<?>> prepared = new ArrayList<TwoPhaseCommitProfileAction<?>>();
- for(ProfileKey key : actions.getProfilesKeys())
+ for(final ProfileKey key : actions.getProfilesKeys())
{
- for(ProfileModificationAction<? extends ProfileModificationContext> action : actions.getActions(key))
+ for(final ProfileModificationAction<? extends ProfileModificationContext> action : actions.getActions(key))
{
// In case a previous action failed to prepare, cancel others
if(success == false)
Modified: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/metadata/ProfileMetaDataFactory.java
===================================================================
--- projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/metadata/ProfileMetaDataFactory.java 2010-03-15 16:10:39 UTC (rev 102413)
+++ projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/metadata/ProfileMetaDataFactory.java 2010-03-15 16:28:25 UTC (rev 102414)
@@ -51,9 +51,6 @@
/** The profiles suffix. */
public static final String PROFILES_SUFFIX = "-profiles.xml";
- /** The instance. */
- private static final ProfileMetaDataFactory INSTANCE = new ProfileMetaDataFactory();
-
/** The profiles filter. */
private static final VirtualFileFilter filter = new ProfilesFilter();
@@ -71,13 +68,8 @@
resolver.mapURIToClass("urn:jboss:profileservice:profiles:1.0", ProfilesMetaData.class);
}
- public static ProfileMetaDataFactory getInstance()
+ public ProfileMetaDataFactory()
{
- return INSTANCE;
- }
-
- protected ProfileMetaDataFactory()
- {
//
}
Modified: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/virtual/assembly/AbstractVirtualAssemblyContext.java
===================================================================
--- projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/virtual/assembly/AbstractVirtualAssemblyContext.java 2010-03-15 16:10:39 UTC (rev 102413)
+++ projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/virtual/assembly/AbstractVirtualAssemblyContext.java 2010-03-15 16:28:25 UTC (rev 102414)
@@ -21,10 +21,12 @@
*/
package org.jboss.profileservice.virtual.assembly;
+import java.io.Closeable;
import java.util.ArrayList;
import java.util.List;
import org.jboss.profileservice.spi.virtual.assembly.VirtualDeploymentAssemblyContext;
+import org.jboss.vfs.VFSUtils;
/**
* A abstract virtual assembly context.
@@ -32,7 +34,7 @@
* @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
* @version $Revision$
*/
-public abstract class AbstractVirtualAssemblyContext
+public abstract class AbstractVirtualAssemblyContext implements Closeable
{
/** The roots. */
@@ -63,5 +65,17 @@
getChildren().add(ctx);
}
}
+
+ public void close()
+ {
+ for(VirtualDeploymentAssemblyContext ctx : children)
+ {
+ if(ctx instanceof Closeable)
+ {
+ VFSUtils.safeClose(Closeable.class.cast(ctx));
+ }
+ }
+ }
+
}
Modified: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/virtual/assembly/BasicVirtualAssemblyContext.java
===================================================================
--- projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/virtual/assembly/BasicVirtualAssemblyContext.java 2010-03-15 16:10:39 UTC (rev 102413)
+++ projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/virtual/assembly/BasicVirtualAssemblyContext.java 2010-03-15 16:28:25 UTC (rev 102414)
@@ -57,14 +57,14 @@
private final AbstractVirtualDeploymentAssembly assembly;
/** The closeable. */
- private final Closeable closeable;
+ private final Closeable assemblyHandle;
public BasicVirtualAssemblyContext(VirtualFileAssembly fileAssembly, VirtualFile vf, Closeable closeable, AbstractVirtualDeploymentAssembly assembly)
{
this.root = vf;
this.fileAssembly = fileAssembly;
this.assembly = assembly;
- this.closeable = closeable;
+ this.assemblyHandle = closeable;
}
public VirtualFile getRoot()
@@ -159,14 +159,6 @@
}
/**
- * {@inheritDoc}
- */
- public void cleanup() throws IOException
- {
- closeable.close();
- }
-
- /**
* Resolve the real file in the {@code ArtifactRepository}.
*
* @param path the artifact meta data
@@ -239,7 +231,8 @@
public void close()
{
- VFSUtils.safeClose(this.closeable);
+ super.close();
+ VFSUtils.safeClose(this.assemblyHandle);
}
}
Modified: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/virtual/assembly/ImmutableAssemblyContext.java
===================================================================
--- projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/virtual/assembly/ImmutableAssemblyContext.java 2010-03-15 16:10:39 UTC (rev 102413)
+++ projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/virtual/assembly/ImmutableAssemblyContext.java 2010-03-15 16:28:25 UTC (rev 102414)
@@ -68,10 +68,5 @@
throw new IllegalStateException("cannot add a child to a non-assembled context");
}
- public void cleanup() throws IOException
- {
-
- }
-
}
Modified: projects/profileservice/trunk/core/src/test/java/org/jboss/test/profileservice/deployment/test/HDScannerUnitTestCase.java
===================================================================
--- projects/profileservice/trunk/core/src/test/java/org/jboss/test/profileservice/deployment/test/HDScannerUnitTestCase.java 2010-03-15 16:10:39 UTC (rev 102413)
+++ projects/profileservice/trunk/core/src/test/java/org/jboss/test/profileservice/deployment/test/HDScannerUnitTestCase.java 2010-03-15 16:28:25 UTC (rev 102414)
@@ -136,7 +136,7 @@
scannerFactory.enableScanning();
- Thread.sleep(6);
+ Thread.sleep(7);
assertTrue(scanner1.isScheduled());
assertFalse(scanner2.isScheduled());
Modified: projects/profileservice/trunk/core/src/test/java/org/jboss/test/profileservice/metadata/test/AbstractProfileServiceMetaDataTest.java
===================================================================
--- projects/profileservice/trunk/core/src/test/java/org/jboss/test/profileservice/metadata/test/AbstractProfileServiceMetaDataTest.java 2010-03-15 16:10:39 UTC (rev 102413)
+++ projects/profileservice/trunk/core/src/test/java/org/jboss/test/profileservice/metadata/test/AbstractProfileServiceMetaDataTest.java 2010-03-15 16:28:25 UTC (rev 102414)
@@ -35,7 +35,7 @@
* @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
* @version $Revision$
*/
-public class AbstractProfileServiceMetaDataTest extends TestCase
+public abstract class AbstractProfileServiceMetaDataTest extends TestCase
{
/** The schema resolver. */
Modified: projects/profileservice/trunk/core/src/test/java/org/jboss/test/profileservice/metadata/test/BasicDomainMetaDataUnitTestCase.java
===================================================================
--- projects/profileservice/trunk/core/src/test/java/org/jboss/test/profileservice/metadata/test/BasicDomainMetaDataUnitTestCase.java 2010-03-15 16:10:39 UTC (rev 102413)
+++ projects/profileservice/trunk/core/src/test/java/org/jboss/test/profileservice/metadata/test/BasicDomainMetaDataUnitTestCase.java 2010-03-15 16:28:25 UTC (rev 102414)
@@ -52,8 +52,8 @@
public void test() throws Exception
{
- URL profiles = findResource("system/profiles");
- ProfileMetaDataFactory metaDataFactory = ProfileMetaDataFactory.getInstance();
+ final URL profiles = findResource("system/profiles");
+ final ProfileMetaDataFactory metaDataFactory = new ProfileMetaDataFactory();
metaDataFactory.parse(profiles);
Modified: projects/profileservice/trunk/core/src/test/java/org/jboss/test/profileservice/repository/test/ArtifactRepositoryUnitTestCase.java
===================================================================
--- projects/profileservice/trunk/core/src/test/java/org/jboss/test/profileservice/repository/test/ArtifactRepositoryUnitTestCase.java 2010-03-15 16:10:39 UTC (rev 102413)
+++ projects/profileservice/trunk/core/src/test/java/org/jboss/test/profileservice/repository/test/ArtifactRepositoryUnitTestCase.java 2010-03-15 16:28:25 UTC (rev 102414)
@@ -65,38 +65,45 @@
//
Map<String, ProfileDeployment> deployments = new HashMap<String, ProfileDeployment>();
- VirtualDeploymentRepository factory = createRepository(metaData);
- for(ProfileMetaData md : profiles.getProfiles())
+ try
{
- for(ProfileDeploymentMetaData deployment : md.getDeployments())
+ VirtualDeploymentRepository factory = createRepository(metaData);
+ for(ProfileMetaData md : profiles.getProfiles())
{
- ProfileDeployment d = factory.createDeployment(deployment);
- assertNotNull(d);
- assertNotNull(d.getTransientAttachments().getAttachment(VirtualDeploymentAssemblyContext.class.getName()));
- deployments.put(deployment.getName(), d);
+ for(ProfileDeploymentMetaData deployment : md.getDeployments())
+ {
+ ProfileDeployment d = factory.createDeployment(deployment);
+ assertNotNull(d);
+ assertNotNull(d.getTransientAttachments().getAttachment(VirtualDeploymentAssemblyContext.class.getName()));
+ deployments.put(deployment.getName(), d);
+ }
}
+
+ VirtualFile vf = deployments.get("test-deployer").getRoot();
+ VirtualFile artifact = vf.getChild("test-common-2.0.0.SP1.jar");
+ assertTrue(artifact.exists());
+ Automounter.mount(vf, artifact, MountOption.EXPANDED);
+ assertTrue(artifact.getChild("META-INF").exists());
+ log.debug(artifact.getPhysicalFile());
+
+ VirtualMavenArtifactMetaData id = new VirtualMavenArtifactMetaData();
+ // <artifact groupId="org.jboss.test" artifactId="test-common" from="2.0.0" to="2.1.0" />
+ id.setArtifactId("test-common");
+ id.setGroupId("org.jboss.test");
+ VirtualFile art = ((TestVirtualDeploymentRepository)factory).getOriginalVirtualFile(id);
+ log.debug(art.getPhysicalFile());
+
+ Automounter.cleanup(vf);
+ log.debug(artifact.getPhysicalFile());
+ assertFalse(artifact.getChild("META-INF").exists());
}
-
- VirtualFile vf = deployments.get("test-deployer").getRoot();
- VirtualFile artifact = vf.getChild("test-common-2.0.0.SP1.jar");
- assertTrue(artifact.exists());
- Automounter.mount(vf, artifact, MountOption.EXPANDED);
- assertTrue(artifact.getChild("META-INF").exists());
- log.debug(artifact.getPhysicalFile());
-
- VirtualMavenArtifactMetaData id = new VirtualMavenArtifactMetaData();
- // <artifact groupId="org.jboss.test" artifactId="test-common" from="2.0.0" to="2.1.0" />
- id.setArtifactId("test-common");
- id.setGroupId("org.jboss.test");
- VirtualFile art = ((TestVirtualDeploymentRepository)factory).getOriginalVirtualFile(id);
- log.debug(art.getPhysicalFile());
-
- Automounter.cleanup(vf);
- log.debug(artifact.getPhysicalFile());
- assertFalse(artifact.getChild("META-INF").exists());
-
-
-
+ finally
+ {
+ for(ProfileDeployment deployment : deployments.values())
+ {
+ deployment.cleanup();
+ }
+ }
}
@SuppressWarnings("unchecked")
Modified: projects/profileservice/trunk/core/src/test/java/org/jboss/test/profileservice/test/BasicProfileServiceUnitTestCase.java
===================================================================
--- projects/profileservice/trunk/core/src/test/java/org/jboss/test/profileservice/test/BasicProfileServiceUnitTestCase.java 2010-03-15 16:10:39 UTC (rev 102413)
+++ projects/profileservice/trunk/core/src/test/java/org/jboss/test/profileservice/test/BasicProfileServiceUnitTestCase.java 2010-03-15 16:28:25 UTC (rev 102414)
@@ -30,6 +30,7 @@
import org.jboss.metadata.spi.MetaData;
import org.jboss.metadata.spi.scope.CommonLevels;
import org.jboss.metadata.spi.scope.ScopeKey;
+import org.jboss.profileservice.Hack;
import org.jboss.profileservice.config.ProfileServiceConstants;
import org.jboss.profileservice.dependency.ProfileDependencyContext;
import org.jboss.profileservice.dependency.ProfileMetaDataRegistry;
@@ -59,13 +60,13 @@
public void test() throws Throwable
{
- // ((AbstractController)getController()).setExecutor(executor);
- // Bootstrap ProfileService
- deploy(getResource("system/bootstrap.xml"));
+ Hack.setCheckHack(false);
+
+ deploy(findResource("system/bootstrap.xml"));
URL profiles = findResource("system/profiles");
- ProfileMetaDataFactory metaDataFactory = ProfileMetaDataFactory.getInstance();
-
+ ProfileMetaDataFactory metaDataFactory = new ProfileMetaDataFactory();
+
metaDataFactory.parse(profiles);
URL domainMetaData = findResource("metadata/domain/domain1.xml");
@@ -138,7 +139,6 @@
{
log.debug(o);
}
-
}
}
Modified: projects/profileservice/trunk/core/src/test/java/org/jboss/test/profileservice/virtual/test/StructureMetaDataUnitTestCase.java
===================================================================
--- projects/profileservice/trunk/core/src/test/java/org/jboss/test/profileservice/virtual/test/StructureMetaDataUnitTestCase.java 2010-03-15 16:10:39 UTC (rev 102413)
+++ projects/profileservice/trunk/core/src/test/java/org/jboss/test/profileservice/virtual/test/StructureMetaDataUnitTestCase.java 2010-03-15 16:28:25 UTC (rev 102414)
@@ -78,25 +78,39 @@
// test.deployer
VirtualDeploymentMetaData deployerVD = deployments.get("test.deployer");
ProfileDeployment deployer = createProfileDeployment(deployerVD);
- StructureMetaData deployerStructure = createStructureMetaData(deployer);
- assertNotNull("null deployer structure", deployerStructure);
- assertMetaDataLocations(deployerStructure.getContext(""));
- assertClassPathEntries(deployerStructure.getContext(""), new String[]
- {"deployer.jar", "fake.jar", "fake2.jar"});
-
+ try
+ {
+ StructureMetaData deployerStructure = createStructureMetaData(deployer);
+ assertNotNull("null deployer structure", deployerStructure);
+ assertMetaDataLocations(deployerStructure.getContext(""));
+ assertClassPathEntries(deployerStructure.getContext(""), new String[]
+ {"deployer.jar", "fake.jar", "fake2.jar"});
+ }
+ finally
+ {
+ deployer.cleanup();
+ }
+
// test deployment
VirtualDeploymentMetaData deploymentVD = deployments.get("test-deployment");
ProfileDeployment deployment = createProfileDeployment(deploymentVD);
- StructureMetaData deploymentStructure = createStructureMetaData(deployment);
- assertNotNull("null deployment structure", deploymentStructure);
- assertMetaDataLocations(deploymentStructure.getContext(""));
- assertClassPathEntries(deploymentStructure.getContext(""),
- new String[] {"deployment.jar"});
- // Check sub deployment ctx
- assertNotNull("test sub deployment", deploymentStructure.getContext("test-sub-deployment"));
- assertMetaDataLocations(deploymentStructure.getContext("test-sub-deployment"));
- assertClassPathEntries(deploymentStructure.getContext("test-sub-deployment"),
- new String[] {"test.jar"});
+ try
+ {
+ StructureMetaData deploymentStructure = createStructureMetaData(deployment);
+ assertNotNull("null deployment structure", deploymentStructure);
+ assertMetaDataLocations(deploymentStructure.getContext(""));
+ assertClassPathEntries(deploymentStructure.getContext(""),
+ new String[] {"deployment.jar"});
+ // Check sub deployment ctx
+ assertNotNull("test sub deployment", deploymentStructure.getContext("test-sub-deployment"));
+ assertMetaDataLocations(deploymentStructure.getContext("test-sub-deployment"));
+ assertClassPathEntries(deploymentStructure.getContext("test-sub-deployment"),
+ new String[] {"test.jar"});
+ }
+ finally
+ {
+ deployment.cleanup();
+ }
}
protected void assertMetaDataLocations(ContextInfo info)
Modified: projects/profileservice/trunk/plugins/src/main/java/org/jboss/profileservice/plugins/deploy/AbstractDeployHandler.java
===================================================================
--- projects/profileservice/trunk/plugins/src/main/java/org/jboss/profileservice/plugins/deploy/AbstractDeployHandler.java 2010-03-15 16:10:39 UTC (rev 102413)
+++ projects/profileservice/trunk/plugins/src/main/java/org/jboss/profileservice/plugins/deploy/AbstractDeployHandler.java 2010-03-15 16:28:25 UTC (rev 102414)
@@ -23,6 +23,7 @@
import java.io.InputStream;
import java.util.Arrays;
+import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
@@ -39,6 +40,7 @@
import org.jboss.profileservice.spi.NoSuchDeploymentException;
import org.jboss.profileservice.spi.NoSuchProfileException;
import org.jboss.profileservice.spi.Profile;
+import org.jboss.profileservice.spi.ProfileDeployment;
import org.jboss.profileservice.spi.ProfileKey;
import org.jboss.profileservice.spi.action.ProfileModificationType;
import org.jboss.profileservice.spi.action.engine.ActionController;
@@ -68,6 +70,24 @@
}
/**
+ * Resolve the deployment names.
+ *
+ * @param names the deployment names
+ * @return the resolved deployment names
+ * @throws NoSuchDeploymentException
+ */
+ protected String[] resolveDeploymentNames(String... names) throws NoSuchDeploymentException
+ {
+ Collection<String> repositoryNames = new HashSet<String>(names.length);
+ for(String name : names)
+ {
+ String resolvedName = resolveDeploymentName(name);
+ repositoryNames.add(resolvedName);
+ }
+ return repositoryNames.toArray(new String[repositoryNames.size()]);
+ }
+
+ /**
* Add a deployment.
*
* @param dtID the deployment id
@@ -253,6 +273,32 @@
return null;
}
}
+
+ /**
+ * Resolve a deployment name against all registered profiles.
+ *
+ * @param name the simple deployment name
+ * @return the resolved deployment name
+ * @throws NoSuchDeploymentException
+ */
+ protected String resolveDeploymentName(String name) throws NoSuchDeploymentException
+ {
+ for(ProfileKey key : actionController.getActiveProfiles())
+ {
+ ManagedProfile managed = actionController.getManagedProfile(key);
+ if(managed == null)
+ {
+ continue;
+ }
+ Profile profile = managed.getProfile();
+ if(profile.hasDeployment(name))
+ {
+ ProfileDeployment deployment = profile.getDeployment(name);
+ return deployment.getName();
+ }
+ }
+ throw new NoSuchDeploymentException(name);
+ }
}
Modified: projects/profileservice/trunk/plugins/src/test/java/org/jboss/test/profileservice/plugins/deploy/support/DeployHandlerSupport.java
===================================================================
--- projects/profileservice/trunk/plugins/src/test/java/org/jboss/test/profileservice/plugins/deploy/support/DeployHandlerSupport.java 2010-03-15 16:10:39 UTC (rev 102413)
+++ projects/profileservice/trunk/plugins/src/test/java/org/jboss/test/profileservice/plugins/deploy/support/DeployHandlerSupport.java 2010-03-15 16:28:25 UTC (rev 102414)
@@ -27,6 +27,7 @@
import org.jboss.deployers.spi.management.deploy.DeploymentID;
import org.jboss.profileservice.plugins.deploy.AbstractDeployHandler;
+import org.jboss.profileservice.spi.NoSuchDeploymentException;
/**
* @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
@@ -35,6 +36,11 @@
public class DeployHandlerSupport extends AbstractDeployHandler
{
+ public String[] resolveDeploymentNames(String... names) throws NoSuchDeploymentException
+ {
+ return super.resolveDeploymentNames(names);
+ }
+
public void addDeployment(URL url)
{
DeploymentID id = new DeploymentIDSupport(url, url.getFile());
Modified: projects/profileservice/trunk/plugins/src/test/java/org/jboss/test/profileservice/plugins/deploy/test/TransientProfileUnitTestCase.java
===================================================================
--- projects/profileservice/trunk/plugins/src/test/java/org/jboss/test/profileservice/plugins/deploy/test/TransientProfileUnitTestCase.java 2010-03-15 16:10:39 UTC (rev 102413)
+++ projects/profileservice/trunk/plugins/src/test/java/org/jboss/test/profileservice/plugins/deploy/test/TransientProfileUnitTestCase.java 2010-03-15 16:28:25 UTC (rev 102414)
@@ -44,38 +44,48 @@
public void testTransient() throws Exception
{
+ // Create the transient profile
MutableProfile profile = new TransientDeploymentsProfile();
ManagedProfileSupport support = new ManagedProfileSupport(profile, getDeployer());
-
getActionController().addProfile(support);
-
+ // Random deployment URL, this does not actually get deployed
URL url = new URL("file:///home/jboss/deployment/deployment1.jar");
+ // Add
getDeployHandler().addDeployment(url);
-
assertTrue(profile.hasDeployment("deployment1.jar"));
assertTrue(profile.hasDeployment(url.toExternalForm()));
+ // Start
getDeployHandler().startDeployment(url);
ProfileDeployment deployment = profile.getDeployment("deployment1.jar");
assertTrue(getDeployer().hasDeployment(deployment.getName()));
assertTrue(deployment.getDeploymentInfo().isDeployed());
assertFalse(deployment.getDeploymentInfo().isLocked());
+ // check profile view
assertNotNull(getView().getManagedDeployment(deployment.getName()));
+ // resolve the name
+ String resolvedName = getDeployHandler().resolveDeploymentNames("deployment1.jar")[0];
+ assertEquals(deployment.getName(), resolvedName);
+
+ // Stop
getDeployHandler().stopDeployments(url);
deployment = profile.getDeployment("deployment1.jar");
assertFalse(getDeployer().hasDeployment(deployment.getName()));
assertFalse(deployment.getDeploymentInfo().isDeployed());
assertTrue(deployment.getDeploymentInfo().isLocked());
+ // Check stopped
ManagedDeployment md = getView().getManagedDeployment(deployment.getName());
assertNotNull(md);
assertEquals(DeploymentState.STOPPED, md.getDeploymentState());
+ // Remove
getDeployHandler().removeDeployments(url);
assertFalse(profile.hasDeployment("deployment1.jar"));
+ assertNull(getView().getManagedDeployment(deployment.getName()));
}
}
More information about the jboss-cvs-commits
mailing list