[jboss-cvs] JBossAS SVN: r99364 - in projects/bootstrap/branches/vfs3-int: build and 5 other directories.

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

Author: johnbailey
Date: 2010-01-13 16:19:59 -0500 (Wed, 13 Jan 2010)
New Revision: 99364

Modified:
   projects/bootstrap/branches/vfs3-int/api-mc/pom.xml
   projects/bootstrap/branches/vfs3-int/build/pom.xml
   projects/bootstrap/branches/vfs3-int/impl-as/pom.xml
   projects/bootstrap/branches/vfs3-int/impl-as/src/main/java/org/jboss/bootstrap/impl/as/lifecycle/VfsInitializingLifecycleEventHandler.java
   projects/bootstrap/branches/vfs3-int/impl-mc/pom.xml
   projects/bootstrap/branches/vfs3-int/legacy/pom.xml
   projects/bootstrap/branches/vfs3-int/spi-mc/pom.xml
Log:
[JBAS-7617] - Initial VFS3 integration for bootstrap

Modified: projects/bootstrap/branches/vfs3-int/api-mc/pom.xml
===================================================================
--- projects/bootstrap/branches/vfs3-int/api-mc/pom.xml	2010-01-13 21:19:55 UTC (rev 99363)
+++ projects/bootstrap/branches/vfs3-int/api-mc/pom.xml	2010-01-13 21:19:59 UTC (rev 99364)
@@ -41,7 +41,7 @@
     </dependency>
 
     <dependency>
-      <groupId>org.jboss.microcontainer</groupId>
+      <groupId>org.jboss.kernel</groupId>
       <artifactId>jboss-kernel</artifactId>
     </dependency>
 

Modified: projects/bootstrap/branches/vfs3-int/build/pom.xml
===================================================================
--- projects/bootstrap/branches/vfs3-int/build/pom.xml	2010-01-13 21:19:55 UTC (rev 99363)
+++ projects/bootstrap/branches/vfs3-int/build/pom.xml	2010-01-13 21:19:59 UTC (rev 99364)
@@ -26,9 +26,9 @@
   <properties>
 
     <!-- Versioning -->
-    <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>
+    <version.org.jboss.logging_jboss.logging.log4j>2.2.0.CR1</version.org.jboss.logging_jboss.logging.log4j>
+    <version.org.jboss.logging_jboss.logging.spi>2.2.0.CR1</version.org.jboss.logging_jboss.logging.spi>
+    <version.org.jboss.microcontainer_jboss.kernel>2.2.0-SNAPSHOT</version.org.jboss.microcontainer_jboss.kernel>
     <version.org.jboss_jbossxb>2.0.0.GA</version.org.jboss_jbossxb>
     <version.junit_junit>4.6</version.junit_junit>
 
@@ -162,7 +162,7 @@
       </dependency>
       
       <dependency>
-        <groupId>org.jboss.microcontainer</groupId>
+        <groupId>org.jboss.kernel</groupId>
         <artifactId>jboss-kernel</artifactId>
         <version>${version.org.jboss.microcontainer_jboss.kernel}</version>
       </dependency>

Modified: projects/bootstrap/branches/vfs3-int/impl-as/pom.xml
===================================================================
--- projects/bootstrap/branches/vfs3-int/impl-as/pom.xml	2010-01-13 21:19:55 UTC (rev 99363)
+++ projects/bootstrap/branches/vfs3-int/impl-as/pom.xml	2010-01-13 21:19:59 UTC (rev 99364)
@@ -25,7 +25,7 @@
 
     <!-- Versions -->
     <!-- REMOVE: JBBOOT-68 -->
-    <version.org.jboss_jboss.vfs>2.2.0.M4</version.org.jboss_jboss.vfs>
+    <version.org.jboss_jboss.vfs>3.0.0.CR1-SNAPSHOT</version.org.jboss_jboss.vfs>
 
   </properties>
 

Modified: projects/bootstrap/branches/vfs3-int/impl-as/src/main/java/org/jboss/bootstrap/impl/as/lifecycle/VfsInitializingLifecycleEventHandler.java
===================================================================
--- projects/bootstrap/branches/vfs3-int/impl-as/src/main/java/org/jboss/bootstrap/impl/as/lifecycle/VfsInitializingLifecycleEventHandler.java	2010-01-13 21:19:55 UTC (rev 99363)
+++ projects/bootstrap/branches/vfs3-int/impl-as/src/main/java/org/jboss/bootstrap/impl/as/lifecycle/VfsInitializingLifecycleEventHandler.java	2010-01-13 21:19:59 UTC (rev 99364)
@@ -29,7 +29,7 @@
 import org.jboss.bootstrap.api.lifecycle.LifecycleState;
 import org.jboss.logging.Logger;
 import org.jboss.net.protocol.URLStreamHandlerFactory;
-import org.jboss.virtual.VFS;
+import org.jboss.vfs.VFS;
 
 /**
  * VfsInitializingLifecycleEventHandler
@@ -81,7 +81,7 @@
          log.debug("Initializing the virtual filesystem...");
 
          // Init the virtual filesystem
-         VFS.init();
+		 VFS.getChild(""); //VFS.init() No longer needed, this will just force it if not already complete
 
          // This bit was copied from the legacy AbstractServerImpl
          try

Modified: projects/bootstrap/branches/vfs3-int/impl-mc/pom.xml
===================================================================
--- projects/bootstrap/branches/vfs3-int/impl-mc/pom.xml	2010-01-13 21:19:55 UTC (rev 99363)
+++ projects/bootstrap/branches/vfs3-int/impl-mc/pom.xml	2010-01-13 21:19:59 UTC (rev 99364)
@@ -24,7 +24,8 @@
   <!-- Properties -->
   <properties>
 
-    <version.org.jboss.man_jboss.managed>2.1.0.SP1</version.org.jboss.man_jboss.managed>
+    <version.org.jboss.man_jboss.managed>2.1.1.GA</version.org.jboss.man_jboss.managed>
+	<version.org.jboss.mdr>2.2.0-SNAPSHOT</version.org.jboss.mdr>
     <version.jetty>6.1.16</version.jetty>
 
   </properties>
@@ -82,9 +83,15 @@
       <version>${version.org.jboss.man_jboss.managed}</version>
     </dependency>
 
+	<dependency>
+      <groupId>org.jboss</groupId>
+      <artifactId>jboss-mdr</artifactId>
+      <version>${version.org.jboss.mdr}</version>
+    </dependency>
+
     <!-- org.jboss.microcontainer:jboss-kernel -->
     <dependency>
-      <groupId>org.jboss.microcontainer</groupId>
+      <groupId>org.jboss.kernel</groupId>
       <artifactId>jboss-kernel</artifactId>
     </dependency>
     

Modified: projects/bootstrap/branches/vfs3-int/legacy/pom.xml
===================================================================
--- projects/bootstrap/branches/vfs3-int/legacy/pom.xml	2010-01-13 21:19:55 UTC (rev 99363)
+++ projects/bootstrap/branches/vfs3-int/legacy/pom.xml	2010-01-13 21:19:59 UTC (rev 99364)
@@ -21,9 +21,9 @@
   <properties>
   
     <!-- Versioning -->
-    <version.org.jboss_jboss.vfs>2.0.1.GA</version.org.jboss_jboss.vfs>
+    <version.org.jboss_jboss.vfs>3.0.0.CR1-SNAPSHOT</version.org.jboss_jboss.vfs>
     <version.org.jboss.man_jboss.managed>2.1.0.GA</version.org.jboss.man_jboss.managed>
-    <version.org.jboss.microcontainer_jboss.kernel>2.0.4.GA</version.org.jboss.microcontainer_jboss.kernel>
+    <version.org.jboss.microcontainer_jboss.kernel>2.2.0-SNAPSHOT</version.org.jboss.microcontainer_jboss.kernel>
     <version.junit_junit>4.5</version.junit_junit>
   
   </properties>
@@ -84,7 +84,7 @@
     
     <!-- org.jboss.microcontainer:jboss-kernel -->
     <dependency>
-      <groupId>org.jboss.microcontainer</groupId>
+      <groupId>org.jboss.kernel</groupId>
       <artifactId>jboss-kernel</artifactId>
       <version>${version.org.jboss.microcontainer_jboss.kernel}</version>
     </dependency>

Modified: projects/bootstrap/branches/vfs3-int/spi-mc/pom.xml
===================================================================
--- projects/bootstrap/branches/vfs3-int/spi-mc/pom.xml	2010-01-13 21:19:55 UTC (rev 99363)
+++ projects/bootstrap/branches/vfs3-int/spi-mc/pom.xml	2010-01-13 21:19:59 UTC (rev 99364)
@@ -47,7 +47,7 @@
     </dependency>
 
     <dependency>
-      <groupId>org.jboss.microcontainer</groupId>
+      <groupId>org.jboss.kernel</groupId>
       <artifactId>jboss-kernel</artifactId>
     </dependency>