[jboss-cvs] JBossAS SVN: r66915 - in trunk: system-jmx/src/main/org/jboss/deployment and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Nov 9 10:06:44 EST 2007
Author: alesj
Date: 2007-11-09 10:06:44 -0500 (Fri, 09 Nov 2007)
New Revision: 66915
Modified:
trunk/server/pom.xml
trunk/system-jmx/src/main/org/jboss/deployment/MainDeployer.java
trunk/system-jmx/src/main/org/jboss/deployment/MainDeployerMBean.java
trunk/testsuite/src/main/org/jboss/test/deployers/AbstractDeploymentTest.java
trunk/testsuite/src/main/org/jboss/test/deployers/ear/test/EARDeploymentUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/deployers/ear/test/EARNoAppXmlDeploymentUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/deployers/ear/test/EmbeddedDatasourceUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/deployers/ear/test/PartUnpackedEARDeploymentUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/deployers/jbas2904/test/EARDeploymentUnitTestCase.java
Log:
Changing usage of DeploymentContext to DeploymentUnit.
Modified: trunk/server/pom.xml
===================================================================
--- trunk/server/pom.xml 2007-11-09 14:23:11 UTC (rev 66914)
+++ trunk/server/pom.xml 2007-11-09 15:06:44 UTC (rev 66915)
@@ -25,7 +25,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>javacc-maven-plugin</artifactId>
- <version>2.2</version>
+ <version>2.1</version>
<executions>
<execution>
<id>jjtree-jbossql</id>
Modified: trunk/system-jmx/src/main/org/jboss/deployment/MainDeployer.java
===================================================================
--- trunk/system-jmx/src/main/org/jboss/deployment/MainDeployer.java 2007-11-09 14:23:11 UTC (rev 66914)
+++ trunk/system-jmx/src/main/org/jboss/deployment/MainDeployer.java 2007-11-09 15:06:44 UTC (rev 66915)
@@ -54,6 +54,7 @@
import org.jboss.deployers.client.spi.DeployerClient;
import org.jboss.deployers.client.spi.Deployment;
import org.jboss.deployers.structure.spi.DeploymentContext;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.deployers.structure.spi.main.MainDeployerStructure;
import org.jboss.deployers.vfs.spi.client.VFSDeployment;
import org.jboss.deployers.vfs.spi.client.VFSDeploymentFactory;
@@ -1339,8 +1340,11 @@
public Deployment getDeployment(URL url)
{
String name = contextMap.get(url);
+ if (name == null)
+ throw new IllegalArgumentException("No such context: " + url);
+
Deployment dc = delegate.getDeployment(name);
- log.info("getDeploymen, url="+url+", dc="+dc);
+ log.info("getDeployment, url="+url+", dc="+dc);
return dc;
}
@@ -1356,13 +1360,36 @@
public DeploymentContext getDeploymentContext(URL url)
{
String name = contextMap.get(url);
+ if (name == null)
+ throw new IllegalArgumentException("No such context: " + url);
+
MainDeployerStructure structure = (MainDeployerStructure) delegate;
DeploymentContext dc = structure.getDeploymentContext(name);
- log.info("getDeploymen, url="+url+", dc="+dc);
+ log.info("getDeploymentContext, url="+url+", dc="+dc);
return dc;
}
/**
+ * The <code>getDeploymentUnit</code> method returns the DeploymentUnit
+ * object for the URL supplied.
+ *
+ * @param url an <code>URL</code> value
+ * @return a <code>DeploymentUnit</code> value
+ * @jmx.managed-operation
+ */
+ public DeploymentUnit getDeploymentUnit(URL url)
+ {
+ String name = contextMap.get(url);
+ if (name == null)
+ throw new IllegalArgumentException("No such context: " + url);
+
+ MainDeployerStructure structure = (MainDeployerStructure) delegate;
+ DeploymentUnit du = structure.getDeploymentUnit(name);
+ log.info("getDeploymentUnit, url="+url+", du="+du);
+ return du;
+ }
+
+ /**
* The <code>getWatchUrl</code> method returns the URL that, when modified,
* indicates that a redeploy is needed.
*
Modified: trunk/system-jmx/src/main/org/jboss/deployment/MainDeployerMBean.java
===================================================================
--- trunk/system-jmx/src/main/org/jboss/deployment/MainDeployerMBean.java 2007-11-09 14:23:11 UTC (rev 66914)
+++ trunk/system-jmx/src/main/org/jboss/deployment/MainDeployerMBean.java 2007-11-09 15:06:44 UTC (rev 66915)
@@ -25,13 +25,12 @@
import java.net.MalformedURLException;
import java.net.URL;
import java.util.Collection;
-
import javax.management.ObjectName;
import org.jboss.deployers.client.spi.DeployerClient;
import org.jboss.deployers.client.spi.Deployment;
import org.jboss.deployers.structure.spi.DeploymentContext;
-import org.jboss.deployers.vfs.spi.client.VFSDeployment;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.kernel.spi.dependency.KernelController;
import org.jboss.mx.util.ObjectNameFactory;
import org.jboss.system.ServiceMBean;
@@ -247,10 +246,21 @@
* for the URL supplied.
* @param url an <code>URL</code> value
* @return a <code>DeploymentContext</code> value
+ * @deprecated use getDeploymentUnit
*/
DeploymentContext getDeploymentContext(URL url);
/**
+ * The <code>getDeploymentUnit</code> method returns the DeploymentUnit
+ * object for the URL supplied.
+ *
+ * @param url an <code>URL</code> value
+ * @return a <code>DeploymentUnit</code> value
+ * @jmx.managed-operation
+ */
+ DeploymentUnit getDeploymentUnit(URL url);
+
+ /**
* The <code>getWatchUrl</code> method returns the URL that,
* when modified, indicates that a redeploy is needed.
* @param url an <code>URL</code> value
Modified: trunk/testsuite/src/main/org/jboss/test/deployers/AbstractDeploymentTest.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/deployers/AbstractDeploymentTest.java 2007-11-09 14:23:11 UTC (rev 66914)
+++ trunk/testsuite/src/main/org/jboss/test/deployers/AbstractDeploymentTest.java 2007-11-09 15:06:44 UTC (rev 66915)
@@ -25,11 +25,9 @@
import java.util.Iterator;
import java.util.List;
import java.util.Set;
-
import javax.management.MBeanServerConnection;
-import org.jboss.deployers.spi.DeploymentState;
-import org.jboss.deployers.structure.spi.DeploymentContext;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.deployment.MainDeployerMBean;
import org.jboss.test.JBossTestCase;
@@ -72,16 +70,26 @@
public static final String notSar1Deployment = "mbean1-not.asar";
public static final String notSar1DeploymentUnpacked = "unpacked-mbean1-not.asar";
- protected DeploymentContext assertDeployed(String deployment) throws Exception
+ protected <T> T invokeMainDeployer(String methodName, Object[] args, String[] sig, Class<T> clazz) throws Exception
{
- DeploymentContext result = getDeploymentInfo(deployment);
+ if (clazz == null)
+ throw new IllegalArgumentException("Null class.");
+
+ MBeanServerConnection server = getServer();
+ Object result = server.invoke(MainDeployerMBean.OBJECT_NAME, methodName, args, sig);
+ return clazz.cast(result);
+ }
+
+ protected DeploymentUnit assertDeployed(String deployment) throws Exception
+ {
+ DeploymentUnit result = getDeploymentUnit(deployment);
assertNotNull("Unable to retrieve deployment info for " + deployment, result);
return result;
}
protected void assertDeployed(String deployment, Set expected) throws Exception
{
- DeploymentContext topInfo = assertDeployed(deployment);
+ DeploymentUnit topInfo = assertDeployed(deployment);
CheckExpectedDeploymentInfoVisitor visitor = new CheckExpectedDeploymentInfoVisitor(expected);
visitor.start(topInfo);
assertTrue("Expected subdeployments: " + expected, expected.isEmpty());
@@ -89,19 +97,26 @@
protected void assertNotDeployed(String deployment) throws Exception
{
- DeploymentContext result = getDeploymentInfo(deployment);
+ DeploymentUnit result = getDeploymentUnit(deployment);
assertNull("Should not be deployed " + result, result);
}
- protected DeploymentContext getDeploymentInfo(String deployment) throws Exception
+ protected DeploymentUnit getDeploymentUnit(String deployment) throws Exception
{
- MBeanServerConnection server = getServer();
URL deployURL = getDeployURL(deployment);
String[] sig = { URL.class.getName() };
Object[] args = {deployURL};
- return (DeploymentContext) server.invoke(MainDeployerMBean.OBJECT_NAME, "getDeploymentContext", args, sig);
+ return invokeMainDeployer("getDeploymentUnit", args, sig, DeploymentUnit.class);
}
+ protected boolean isDeployed(String deployment) throws Exception
+ {
+ URL deployURL = getDeployURL(deployment);
+ String[] sig = { URL.class.getName() };
+ Object[] args = {deployURL};
+ return invokeMainDeployer("isDeployed", args, sig, Boolean.class);
+ }
+
public AbstractDeploymentTest(String test)
{
super(test);
@@ -109,27 +124,27 @@
public static class DeploymentInfoVisitor
{
- public void start(DeploymentContext topLevel)
+ public void start(DeploymentUnit topLevel)
{
doVisit(topLevel);
}
- protected void doVisit(DeploymentContext info)
+ protected void doVisit(DeploymentUnit info)
{
visit(info);
- List<DeploymentContext> subDeployments = info.getChildren();
+ List<DeploymentUnit> subDeployments = info.getChildren();
if (subDeployments == null || subDeployments.size() == 0)
return;
for (Iterator i = subDeployments.iterator(); i.hasNext(); )
{
- DeploymentContext child = (DeploymentContext) i.next();
+ DeploymentUnit child = (DeploymentUnit) i.next();
doVisit(child);
}
}
- public void visit(DeploymentContext info)
+ public void visit(DeploymentUnit info)
{
}
}
@@ -143,7 +158,7 @@
this.expected = expected;
}
- public void visit(DeploymentContext info)
+ public void visit(DeploymentUnit info)
{
String shortName = shortNameFromDeploymentName(info.getName());
log.info("Found deployment " + shortName);
@@ -152,8 +167,16 @@
fail(shortName + " not expected, or duplicate?");
else
{
- DeploymentState state = info.getState();
- assertEquals("Should be fully deployed: " + shortName + " state=" + state, DeploymentState.DEPLOYED, state);
+ boolean deployed;
+ try
+ {
+ deployed = isDeployed(info.getName());
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException(e);
+ }
+ assertTrue("Should be fully deployed: " + shortName, deployed);
}
}
}
Modified: trunk/testsuite/src/main/org/jboss/test/deployers/ear/test/EARDeploymentUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/deployers/ear/test/EARDeploymentUnitTestCase.java 2007-11-09 14:23:11 UTC (rev 66914)
+++ trunk/testsuite/src/main/org/jboss/test/deployers/ear/test/EARDeploymentUnitTestCase.java 2007-11-09 15:06:44 UTC (rev 66915)
@@ -24,8 +24,7 @@
import java.util.HashSet;
import junit.framework.Test;
-
-import org.jboss.deployers.structure.spi.DeploymentContext;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.test.deployers.AbstractDeploymentTest;
/**
@@ -50,7 +49,7 @@
expected.add(service1Deployment);
expected.add(sar1Deployment);
- DeploymentContext topInfo = assertDeployed(ear1Deployment);
+ DeploymentUnit topInfo = assertDeployed(ear1Deployment);
CheckExpectedDeploymentInfoVisitor visitor = new CheckExpectedDeploymentInfoVisitor(expected);
visitor.start(topInfo);
assertTrue("Expected subdeployments: " + expected, expected.isEmpty());
Modified: trunk/testsuite/src/main/org/jboss/test/deployers/ear/test/EARNoAppXmlDeploymentUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/deployers/ear/test/EARNoAppXmlDeploymentUnitTestCase.java 2007-11-09 14:23:11 UTC (rev 66914)
+++ trunk/testsuite/src/main/org/jboss/test/deployers/ear/test/EARNoAppXmlDeploymentUnitTestCase.java 2007-11-09 15:06:44 UTC (rev 66915)
@@ -24,8 +24,7 @@
import java.util.HashSet;
import junit.framework.Test;
-
-import org.jboss.deployers.structure.spi.DeploymentContext;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.test.deployers.AbstractDeploymentTest;
/**
@@ -51,7 +50,7 @@
expected.add(rar1Deployment);
expected.add(client1Deployment);
- DeploymentContext topInfo = assertDeployed(earNoAppXml);
+ DeploymentUnit topInfo = assertDeployed(earNoAppXml);
CheckExpectedDeploymentInfoVisitor visitor = new CheckExpectedDeploymentInfoVisitor(expected);
visitor.start(topInfo);
assertTrue("Expected subdeployments: " + expected, expected.isEmpty());
Modified: trunk/testsuite/src/main/org/jboss/test/deployers/ear/test/EmbeddedDatasourceUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/deployers/ear/test/EmbeddedDatasourceUnitTestCase.java 2007-11-09 14:23:11 UTC (rev 66914)
+++ trunk/testsuite/src/main/org/jboss/test/deployers/ear/test/EmbeddedDatasourceUnitTestCase.java 2007-11-09 15:06:44 UTC (rev 66915)
@@ -24,8 +24,7 @@
import java.util.HashSet;
import junit.framework.Test;
-
-import org.jboss.deployers.structure.spi.DeploymentContext;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.test.deployers.AbstractDeploymentTest;
/**
@@ -48,7 +47,7 @@
expected.add(jbas4548_ds);
expected.add(jbas4548_ejb);
- DeploymentContext topInfo = assertDeployed(jbas4548_ear);
+ DeploymentUnit topInfo = assertDeployed(jbas4548_ear);
CheckExpectedDeploymentInfoVisitor visitor = new CheckExpectedDeploymentInfoVisitor(expected);
visitor.start(topInfo);
assertTrue("Expected subdeployments: " + expected, expected.isEmpty());
Modified: trunk/testsuite/src/main/org/jboss/test/deployers/ear/test/PartUnpackedEARDeploymentUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/deployers/ear/test/PartUnpackedEARDeploymentUnitTestCase.java 2007-11-09 14:23:11 UTC (rev 66914)
+++ trunk/testsuite/src/main/org/jboss/test/deployers/ear/test/PartUnpackedEARDeploymentUnitTestCase.java 2007-11-09 15:06:44 UTC (rev 66915)
@@ -24,8 +24,7 @@
import java.util.HashSet;
import junit.framework.Test;
-
-import org.jboss.deployers.structure.spi.DeploymentContext;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.test.deployers.AbstractDeploymentTest;
/**
@@ -50,7 +49,7 @@
expected.add(service1Deployment);
expected.add(sar1Deployment);
- DeploymentContext topInfo = assertDeployed(ear1DeploymentUnpacked);
+ DeploymentUnit topInfo = assertDeployed(ear1DeploymentUnpacked);
CheckExpectedDeploymentInfoVisitor visitor = new CheckExpectedDeploymentInfoVisitor(expected);
visitor.start(topInfo);
assertTrue("Expected subdeployments: " + expected, expected.isEmpty());
Modified: trunk/testsuite/src/main/org/jboss/test/deployers/jbas2904/test/EARDeploymentUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/deployers/jbas2904/test/EARDeploymentUnitTestCase.java 2007-11-09 14:23:11 UTC (rev 66914)
+++ trunk/testsuite/src/main/org/jboss/test/deployers/jbas2904/test/EARDeploymentUnitTestCase.java 2007-11-09 15:06:44 UTC (rev 66915)
@@ -11,12 +11,10 @@
import java.util.Collections;
import java.util.Comparator;
import java.util.StringTokenizer;
-
import javax.management.ObjectName;
import junit.framework.Test;
-
-import org.jboss.deployers.structure.spi.DeploymentContext;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentContext;
import org.jboss.test.deployers.AbstractDeploymentTest;
@@ -42,7 +40,7 @@
public void testEARDeployment() throws Exception
{
- DeploymentContext topInfo = assertDeployed("testdeployers-jbas2904.ear");
+ DeploymentUnit topInfo = assertDeployed("testdeployers-jbas2904.ear");
// Expected ordering of the subdeployments
Object actualModules[] = topInfo.getChildren().toArray();
ArrayList expectedList = new ArrayList(actualModules.length);
More information about the jboss-cvs-commits
mailing list