[jboss-cvs] JBossAS SVN: r63733 - in trunk/testsuite: src/main/org/jboss/test/deployers and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Jun 28 13:25:57 EDT 2007
Author: adrian at jboss.org
Date: 2007-06-28 13:25:57 -0400 (Thu, 28 Jun 2007)
New Revision: 63733
Modified:
trunk/testsuite/.classpath
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/PartUnpackedEARDeploymentUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/deployers/jbas2904/test/EARDeploymentUnitTestCase.java
Log:
Deployers reloaded
Modified: trunk/testsuite/.classpath
===================================================================
--- trunk/testsuite/.classpath 2007-06-28 17:25:43 UTC (rev 63732)
+++ trunk/testsuite/.classpath 2007-06-28 17:25:57 UTC (rev 63733)
@@ -56,7 +56,7 @@
<classpathentry kind="lib" path="/thirdparty/sun-jsf/lib/jsf-api.jar"/>
<classpathentry kind="lib" path="/thirdparty/sun-jsf/lib/jsf-impl.jar"/>
<classpathentry kind="lib" path="/thirdparty/sun-jstl/lib/jstl.jar"/>
- <classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-microcontainer.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-kernel.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-dependency.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-container.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/test/lib/jboss-test.jar" sourcepath="/thirdparty/jboss/test/lib/jboss-test-src.zip"/>
@@ -68,7 +68,6 @@
<classpathentry kind="lib" path="/thirdparty/jboss/web/lib/jbossweb-extras.jar"/>
<classpathentry kind="lib" path="/thirdparty/sun-opends/lib/OpenDS.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/system-jmx"/>
- <classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-deployers.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/aop/lib/jboss-aop-jdk50.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/aop/lib/jboss-standalone-aspect-library-jdk50.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/aop/lib/pluggable-instrumentor.jar"/>
@@ -88,6 +87,9 @@
<classpathentry kind="lib" path="/thirdparty/jboss/jboss-javaee/lib/jboss-javaee.jar" sourcepath="/thirdparty/jboss/jboss-javaee/lib/jboss-javaee-sources.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/jboss-jaspi-api/lib/jboss-jaspi-api.jar" sourcepath="/thirdparty/jboss/jboss-jaspi-api/lib/jboss-jaspi-api-sources.jar"/>
<classpathentry kind="lib" path="/thirdparty/httpunit/lib/httpunit.jar"/>
- <classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-metatype.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-metatype-src.zip"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-deployers-core-spi.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-deployers-core-spi-sources.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-deployers-client-spi.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-deployers-core-spi-sources.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-deployers-structure-spi.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-deployers-structure-spi-sources.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-deployers-vfs-spi.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-deployers-vfs-spi-sources.jar"/>
<classpathentry kind="output" path="output/eclipse-classes"/>
</classpath>
Modified: trunk/testsuite/src/main/org/jboss/test/deployers/AbstractDeploymentTest.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/deployers/AbstractDeploymentTest.java 2007-06-28 17:25:43 UTC (rev 63732)
+++ trunk/testsuite/src/main/org/jboss/test/deployers/AbstractDeploymentTest.java 2007-06-28 17:25:57 UTC (rev 63733)
@@ -23,12 +23,13 @@
import java.net.URL;
import java.util.Iterator;
+import java.util.List;
import java.util.Set;
import javax.management.MBeanServerConnection;
-import org.jboss.deployers.spi.structure.DeploymentContext;
-import org.jboss.deployers.spi.structure.DeploymentState;
+import org.jboss.deployers.spi.DeploymentState;
+import org.jboss.deployers.structure.spi.DeploymentContext;
import org.jboss.deployment.MainDeployerMBean;
import org.jboss.test.JBossTestCase;
@@ -98,7 +99,7 @@
URL deployURL = getDeployURL(deployment);
String[] sig = { URL.class.getName() };
Object[] args = {deployURL};
- DeploymentContext dc = (DeploymentContext) server.invoke(MainDeployerMBean.OBJECT_NAME, "getDeployment", args, sig);
+ DeploymentContext dc = (DeploymentContext) server.invoke(MainDeployerMBean.OBJECT_NAME, "getDeploymentContext", args, sig);
return dc;
}
@@ -118,7 +119,7 @@
{
visit(info);
- Set<DeploymentContext> subDeployments = info.getChildren();
+ List<DeploymentContext> subDeployments = info.getChildren();
if (subDeployments == null || subDeployments.size() == 0)
return;
@@ -161,6 +162,7 @@
* A utility method that takes a deployment unit name and strips it down to the base war
* name without the .war suffix.
* @param name - the DeploymentUnit name.
+ * @return the short name
*/
public static String shortNameFromDeploymentName(String name)
{
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-06-28 17:25:43 UTC (rev 63732)
+++ trunk/testsuite/src/main/org/jboss/test/deployers/ear/test/EARDeploymentUnitTestCase.java 2007-06-28 17:25:57 UTC (rev 63733)
@@ -25,8 +25,7 @@
import junit.framework.Test;
-import org.jboss.deployers.spi.structure.DeploymentContext;
-import org.jboss.deployment.DeploymentInfo;
+import org.jboss.deployers.structure.spi.DeploymentContext;
import org.jboss.test.deployers.AbstractDeploymentTest;
/**
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-06-28 17:25:43 UTC (rev 63732)
+++ trunk/testsuite/src/main/org/jboss/test/deployers/ear/test/EARNoAppXmlDeploymentUnitTestCase.java 2007-06-28 17:25:57 UTC (rev 63733)
@@ -23,11 +23,11 @@
import java.util.HashSet;
-import org.jboss.test.deployers.AbstractDeploymentTest;
-import org.jboss.deployers.spi.structure.DeploymentContext;
-import org.jboss.deployment.DeploymentInfo;
import junit.framework.Test;
+import org.jboss.deployers.structure.spi.DeploymentContext;
+import org.jboss.test.deployers.AbstractDeploymentTest;
+
/**
* A test that deploys everything in a JavaEE 5 EAR without using an
* application.xml descriptor.
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-06-28 17:25:43 UTC (rev 63732)
+++ trunk/testsuite/src/main/org/jboss/test/deployers/ear/test/PartUnpackedEARDeploymentUnitTestCase.java 2007-06-28 17:25:57 UTC (rev 63733)
@@ -25,8 +25,7 @@
import junit.framework.Test;
-import org.jboss.deployers.spi.structure.DeploymentContext;
-import org.jboss.deployment.DeploymentInfo;
+import org.jboss.deployers.structure.spi.DeploymentContext;
import org.jboss.test.deployers.AbstractDeploymentTest;
/**
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-06-28 17:25:43 UTC (rev 63732)
+++ trunk/testsuite/src/main/org/jboss/test/deployers/jbas2904/test/EARDeploymentUnitTestCase.java 2007-06-28 17:25:57 UTC (rev 63733)
@@ -6,26 +6,20 @@
*/
package org.jboss.test.deployers.jbas2904.test;
+import java.net.URL;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.StringTokenizer;
-import java.io.InputStream;
-import java.io.File;
-import java.io.FileInputStream;
+import javax.management.ObjectName;
-import java.net.URL;
-
import junit.framework.Test;
-import org.jboss.deployers.spi.structure.DeploymentContext;
-import org.jboss.deployment.DeploymentInfo;
-
+import org.jboss.deployers.structure.spi.DeploymentContext;
+import org.jboss.deployers.vfs.spi.structure.VFSDeploymentContext;
import org.jboss.test.deployers.AbstractDeploymentTest;
-import javax.management.ObjectName;
-
/**
* A test for JBAB2904
*
@@ -55,7 +49,7 @@
System.out.println("Expected Deployment Ordering -------> ");
for (int count = 0; count < actualModules.length; count++)
{
- DeploymentContext child = (DeploymentContext) actualModules[count];
+ VFSDeploymentContext child = (VFSDeploymentContext) actualModules[count];
URL url = child.getRoot().toURL();
String moduleName = getModuleDeployed(url.toString());
expectedList.add(moduleName);
More information about the jboss-cvs-commits
mailing list