[jboss-cvs] JBossAS SVN: r101614 - in branches/vfs3-int: system/src/main/java/org/jboss/system/server/profileservice/repository and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sun Feb 28 09:17:46 EST 2010
Author: emuckenhuber
Date: 2010-02-28 09:17:46 -0500 (Sun, 28 Feb 2010)
New Revision: 101614
Modified:
branches/vfs3-int/profileservice/src/main/java/org/jboss/profileservice/management/upload/remoting/AbstractDeployHandler.java
branches/vfs3-int/system/src/main/java/org/jboss/system/server/profileservice/repository/AbstractVFSProfileSource.java
branches/vfs3-int/testsuite/src/main/org/jboss/test/deployers/test/DeploymentManagerUnitTestCase.java
branches/vfs3-int/testsuite/src/main/org/jboss/test/profileservice/test/JMXMappingUnitTestCase.java
branches/vfs3-int/testsuite/src/main/org/jboss/test/profileservice/test/ProfileServiceUnitTestCase.java
Log:
updates for some failing profileservice tests.
Modified: branches/vfs3-int/profileservice/src/main/java/org/jboss/profileservice/management/upload/remoting/AbstractDeployHandler.java
===================================================================
--- branches/vfs3-int/profileservice/src/main/java/org/jboss/profileservice/management/upload/remoting/AbstractDeployHandler.java 2010-02-28 04:58:59 UTC (rev 101613)
+++ branches/vfs3-int/profileservice/src/main/java/org/jboss/profileservice/management/upload/remoting/AbstractDeployHandler.java 2010-02-28 14:17:46 UTC (rev 101614)
@@ -31,12 +31,12 @@
import javax.management.MBeanServer;
+import org.jboss.aop.joinpoint.Invocation;
+import org.jboss.aop.joinpoint.InvocationResponse;
import org.jboss.aspects.remoting.AOPRemotingInvocationHandler;
import org.jboss.deployers.spi.management.deploy.DeploymentID;
import org.jboss.deployers.spi.management.deploy.DeploymentManager;
import org.jboss.logging.Logger;
-import org.jboss.aop.joinpoint.Invocation;
-import org.jboss.aop.joinpoint.InvocationResponse;
import org.jboss.profileservice.management.client.upload.SerializableDeploymentID;
import org.jboss.profileservice.remoting.SecurityContainer;
import org.jboss.profileservice.spi.DeploymentRepository;
@@ -297,10 +297,14 @@
ProfileKey key = deploymentTarget.getProfile();
String profileName = key.getName();
String deploymentName = createDeploymentName(vf);
- ProfileDeployment deployment = createDeployment(profileName, deploymentName, vf);
- // Add deployment
- deploymentRepository.addDeployment(deployment.getName(), deployment);
- deploymentRepository.lockDeploymentContent(deployment.getName());
+ // Don't try to re-mount
+ if(deploymentRepository.getDeploymentNames().contains(deploymentName) == false)
+ {
+ ProfileDeployment deployment = createDeployment(profileName, deploymentName, vf);
+ // Add deployment
+ deploymentRepository.addDeployment(deployment.getName(), deployment);
+ }
+ deploymentRepository.lockDeploymentContent(deploymentName);
log.info("End handle stream, repositoryName: " + repositoryName);
// Return the repository names
Modified: branches/vfs3-int/system/src/main/java/org/jboss/system/server/profileservice/repository/AbstractVFSProfileSource.java
===================================================================
--- branches/vfs3-int/system/src/main/java/org/jboss/system/server/profileservice/repository/AbstractVFSProfileSource.java 2010-02-28 04:58:59 UTC (rev 101613)
+++ branches/vfs3-int/system/src/main/java/org/jboss/system/server/profileservice/repository/AbstractVFSProfileSource.java 2010-02-28 14:17:46 UTC (rev 101614)
@@ -299,7 +299,7 @@
return;
// If it's a directory or exploded deployment
- if(component.isFile() == false)
+ if(component.isFile() == false)
{
// Check the name
if(isRecursiveScan() && component.getName().indexOf('.') == -1)
Modified: branches/vfs3-int/testsuite/src/main/org/jboss/test/deployers/test/DeploymentManagerUnitTestCase.java
===================================================================
--- branches/vfs3-int/testsuite/src/main/org/jboss/test/deployers/test/DeploymentManagerUnitTestCase.java 2010-02-28 04:58:59 UTC (rev 101613)
+++ branches/vfs3-int/testsuite/src/main/org/jboss/test/deployers/test/DeploymentManagerUnitTestCase.java 2010-02-28 14:17:46 UTC (rev 101614)
@@ -100,6 +100,15 @@
}
catch(Exception e)
{
+ try
+ {
+ stopAndRemove(new String[] { deploymentName });
+ }
+ catch(Exception ne)
+ {
+ log.debug("failed to stop deployment ", ne);
+ }
+
log.debug("Failed ", e);
throw e;
}
Modified: branches/vfs3-int/testsuite/src/main/org/jboss/test/profileservice/test/JMXMappingUnitTestCase.java
===================================================================
--- branches/vfs3-int/testsuite/src/main/org/jboss/test/profileservice/test/JMXMappingUnitTestCase.java 2010-02-28 04:58:59 UTC (rev 101613)
+++ branches/vfs3-int/testsuite/src/main/org/jboss/test/profileservice/test/JMXMappingUnitTestCase.java 2010-02-28 14:17:46 UTC (rev 101614)
@@ -217,7 +217,7 @@
Set<ManagedComponent> comps = mgtView.getComponentsForType(new ComponentType("WAR", "Context"));
for (ManagedComponent comp : comps)
{
- if (comp.getDeployment().getName().endsWith("jmx-console.war/"))
+ if (comp.getDeployment().getName().endsWith("jmx-console.war"))
{
assertEquals("/jmx-console", ((SimpleValue)comp.getProperty("contextRoot").getValue()).getValue());
return;
Modified: branches/vfs3-int/testsuite/src/main/org/jboss/test/profileservice/test/ProfileServiceUnitTestCase.java
===================================================================
--- branches/vfs3-int/testsuite/src/main/org/jboss/test/profileservice/test/ProfileServiceUnitTestCase.java 2010-02-28 04:58:59 UTC (rev 101613)
+++ branches/vfs3-int/testsuite/src/main/org/jboss/test/profileservice/test/ProfileServiceUnitTestCase.java 2010-02-28 14:17:46 UTC (rev 101614)
@@ -157,26 +157,26 @@
"conf/bootstrap/jmx.xml",
"conf/bootstrap/profile.xml",
"conf/jboss-service.xml",
- "deployers/jbossweb.deployer/",
+ "deployers/jbossweb.deployer",
"deployers/ear-deployer-jboss-beans.xml",
- "deployers/jbossws.deployer/",
+ "deployers/jbossws.deployer",
"deployers/ejb-deployer-jboss-beans.xml",
- "deployers/ejb3.deployer/",
- "deployers/jboss-aop-jboss5.deployer/",
+ "deployers/ejb3.deployer",
+ "deployers/jboss-aop-jboss5.deployer",
"deployers/security-deployer-jboss-beans.xml",
- "deployers/jboss-jca.deployer/",
+ "deployers/jboss-jca.deployer",
"deploy/hsqldb-ds.xml",
- "deploy/jboss-local-jdbc.rar/",
- "deploy/jboss-xa-jdbc.rar/",
+ "deploy/jboss-local-jdbc.rar",
+ "deploy/jboss-xa-jdbc.rar",
"deploy/jca-jboss-beans.xml",
"deploy/messaging/connection-factories-service.xml",
"deploy/messaging/destinations-service.xml",
- "deploy/jms-ra.rar/",
+ "deploy/jms-ra.rar",
"deploy/jmx-invoker-service.xml",
- "deploy/jmx-remoting.sar/",
+ "deploy/jmx-remoting.sar",
"deploy/jsr88-service.xml",
"deploy/mail-service.xml",
- "deploy/ROOT.war/"
+ "deploy/ROOT.war"
};
TreeSet<String> missingNames = new TreeSet<String>();
for (String name : expectedNames)
More information about the jboss-cvs-commits
mailing list