[jboss-cvs] JBossAS SVN: r91860 - in projects/bootstrap/trunk/spi-test: src/test/java/org/jboss/bootstrap/spi/test and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: ALRubinger
Date: 2009-07-30 22:27:37 -0400 (Thu, 30 Jul 2009)
New Revision: 91860

Modified:
   projects/bootstrap/trunk/spi-test/pom.xml
   projects/bootstrap/trunk/spi-test/src/test/java/org/jboss/bootstrap/spi/test/ClassLoadingTestCase.java
Log:
[JBBOOT-102] Update the ClassLoading test case for the new API/SPI changes

Modified: projects/bootstrap/trunk/spi-test/pom.xml
===================================================================
--- projects/bootstrap/trunk/spi-test/pom.xml	2009-07-31 02:20:42 UTC (rev 91859)
+++ projects/bootstrap/trunk/spi-test/pom.xml	2009-07-31 02:27:37 UTC (rev 91860)
@@ -28,10 +28,12 @@
 
     <!-- Versioning -->
     <version.org.jboss.aop_jboss.aop>2.0.0.SP1</version.org.jboss.aop_jboss.aop>
-    <version.org.jboss.bootstrap_jboss.bootstrap.impl.base>0.1.2-SNAPSHOT</version.org.jboss.bootstrap_jboss.bootstrap.impl.base>
-    <version.org.jboss.bootstrap_jboss.bootstrap.impl.mc>0.1.2-SNAPSHOT</version.org.jboss.bootstrap_jboss.bootstrap.impl.mc>
-    <version.org.jboss.bootstrap_jboss.bootstrap.spi>0.1.2-SNAPSHOT</version.org.jboss.bootstrap_jboss.bootstrap.spi>
-    <version.org.jboss.bootstrap_jboss.bootstrap.spi.mc>0.1.2-SNAPSHOT</version.org.jboss.bootstrap_jboss.bootstrap.spi.mc>
+    <version.org.jboss.bootstrap_jboss.bootstrap.impl.base>2.0.0-SNAPSHOT</version.org.jboss.bootstrap_jboss.bootstrap.impl.base>
+    <version.org.jboss.bootstrap_jboss.bootstrap.impl.mc>2.0.0-SNAPSHOT</version.org.jboss.bootstrap_jboss.bootstrap.impl.mc>
+    <version.org.jboss.bootstrap_jboss.bootstrap.api>2.0.0-SNAPSHOT</version.org.jboss.bootstrap_jboss.bootstrap.api>
+    <version.org.jboss.bootstrap_jboss.bootstrap.spi>2.0.0-SNAPSHOT</version.org.jboss.bootstrap_jboss.bootstrap.spi>
+    <version.org.jboss.bootstrap_jboss.bootstrap.api.mc>2.0.0-SNAPSHOT</version.org.jboss.bootstrap_jboss.bootstrap.api.mc>
+    <version.org.jboss.bootstrap_jboss.bootstrap.spi.mc>2.0.0-SNAPSHOT</version.org.jboss.bootstrap_jboss.bootstrap.spi.mc>
     <version.org.jboss.logging_jboss.logging.log4j>2.0.6.GA</version.org.jboss.logging_jboss.logging.log4j>
     <version.org.jboss.logging_jboss.logging.spi>2.0.5.GA</version.org.jboss.logging_jboss.logging.spi>
     <version.org.jboss.microcontainer_jboss.kernel>2.0.4.GA</version.org.jboss.microcontainer_jboss.kernel>
@@ -73,11 +75,21 @@
               <artifactItems>
                 <artifactItem>
                   <groupId>org.jboss.bootstrap</groupId>
+                  <artifactId>jboss-bootstrap-api</artifactId>
+                  <version>${version.org.jboss.bootstrap_jboss.bootstrap.api}</version>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.jboss.bootstrap</groupId>
                   <artifactId>jboss-bootstrap-spi</artifactId>
                   <version>${version.org.jboss.bootstrap_jboss.bootstrap.spi}</version>
                 </artifactItem>
                 <artifactItem>
                   <groupId>org.jboss.bootstrap</groupId>
+                  <artifactId>jboss-bootstrap-api-mc</artifactId>
+                  <version>${version.org.jboss.bootstrap_jboss.bootstrap.api.mc}</version>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.jboss.bootstrap</groupId>
                   <artifactId>jboss-bootstrap-spi-mc</artifactId>
                   <version>${version.org.jboss.bootstrap_jboss.bootstrap.spi.mc}</version>
                 </artifactItem>
@@ -216,8 +228,8 @@
 
     <dependency>
       <groupId>org.jboss.bootstrap</groupId>
-      <artifactId>jboss-bootstrap-spi</artifactId>
-      <version>${version.org.jboss.bootstrap_jboss.bootstrap.spi}</version>
+      <artifactId>jboss-bootstrap-api</artifactId>
+      <version>${version.org.jboss.bootstrap_jboss.bootstrap.api}</version>
     </dependency>
 
     <dependency>

Modified: projects/bootstrap/trunk/spi-test/src/test/java/org/jboss/bootstrap/spi/test/ClassLoadingTestCase.java
===================================================================
--- projects/bootstrap/trunk/spi-test/src/test/java/org/jboss/bootstrap/spi/test/ClassLoadingTestCase.java	2009-07-31 02:20:42 UTC (rev 91859)
+++ projects/bootstrap/trunk/spi-test/src/test/java/org/jboss/bootstrap/spi/test/ClassLoadingTestCase.java	2009-07-31 02:27:37 UTC (rev 91860)
@@ -33,9 +33,9 @@
 
 import junit.framework.TestCase;
 
-import org.jboss.bootstrap.spi.factory.ServerFactory;
-import org.jboss.bootstrap.spi.lifecycle.LifecycleState;
-import org.jboss.bootstrap.spi.server.Server;
+import org.jboss.bootstrap.api.factory.ServerFactory;
+import org.jboss.bootstrap.api.lifecycle.LifecycleState;
+import org.jboss.bootstrap.api.server.Server;
 import org.junit.Test;
 
 /**
@@ -80,7 +80,7 @@
     * create a new ClassLoader to add the appropriate libs.
     * 
     * This method intentionally throws no Exceptions to be self-documenting 
-    * as to the usage of the SPI Factories.
+    * as to the usage of the API Factories.
     */
    @Test
    public void testServerStart()
@@ -123,7 +123,7 @@
          getOut().println("Configured bootstrap home: " + bootstrapHome);
 
          // Ensure not started
-         if (!server.getState().equals(LifecycleState.PRE_INIT))
+         if (!server.getState().equals(LifecycleState.INSTANCIATED))
          {
             TestCase.fail("Test has server reporting the wrong state before started");
          }