[jboss-cvs] JBossAS SVN: r59159 - in projects/microcontainer/trunk: build container container/src/main/org/jboss container/src/resources/tests container/src/tests/org/jboss/test deployers osgi-int

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

Author: scott.stark at jboss.org
Date: 2006-12-19 16:10:36 -0500 (Tue, 19 Dec 2006)
New Revision: 59159

Removed:
   projects/microcontainer/trunk/container/src/main/org/jboss/virtual/
   projects/microcontainer/trunk/container/src/resources/tests/vfs/
   projects/microcontainer/trunk/container/src/tests/org/jboss/test/virtual/
Modified:
   projects/microcontainer/trunk/build/build-thirdparty.xml
   projects/microcontainer/trunk/container/.classpath
   projects/microcontainer/trunk/container/build.xml
   projects/microcontainer/trunk/container/src/tests/org/jboss/test/ContainerAllTestSuite.java
   projects/microcontainer/trunk/deployers/.classpath
   projects/microcontainer/trunk/deployers/build.xml
   projects/microcontainer/trunk/osgi-int/.classpath
   projects/microcontainer/trunk/osgi-int/build.xml
Log:
Remove the vfs code from the container project.

Modified: projects/microcontainer/trunk/build/build-thirdparty.xml
===================================================================
--- projects/microcontainer/trunk/build/build-thirdparty.xml	2006-12-19 20:59:28 UTC (rev 59158)
+++ projects/microcontainer/trunk/build/build-thirdparty.xml	2006-12-19 21:10:36 UTC (rev 59159)
@@ -51,6 +51,7 @@
       <componentref name="jboss/common-logging-jdk" version="2.0.2.GA"/>
       <componentref name="jboss/common-logging-spi" version="2.0.2.GA"/>
       <componentref name="jboss/jbossxb" version="snapshot"/>
+      <componentref name="jboss/jboss-vfs" version="2.0.0.Beta2"/>
       <componentref name="jboss/profiler/jvmti" version="1.0.0.CR4"/>
       <componentref name="junit" version="3.8.1"/>
       <componentref name="junit4" version="4.1"/>

Modified: projects/microcontainer/trunk/container/.classpath
===================================================================
--- projects/microcontainer/trunk/container/.classpath	2006-12-19 20:59:28 UTC (rev 59158)
+++ projects/microcontainer/trunk/container/.classpath	2006-12-19 21:10:36 UTC (rev 59159)
@@ -14,5 +14,6 @@
 	<classpathentry kind="lib" path="/thirdparty/javassist/lib/javassist.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/profiler/jvmti/lib/jboss-profiler-jvmti.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/test/lib/jboss-test.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/jboss-vfs/lib/jboss-vfs.jar" sourcepath="/thirdparty/jboss/jboss-vfs/lib/jboss-vfs-sources.jar"/>
 	<classpathentry kind="output" path="output/eclipse-classes"/>
 </classpath>

Modified: projects/microcontainer/trunk/container/build.xml
===================================================================
--- projects/microcontainer/trunk/container/build.xml	2006-12-19 20:59:28 UTC (rev 59158)
+++ projects/microcontainer/trunk/container/build.xml	2006-12-19 21:10:36 UTC (rev 59159)
@@ -73,6 +73,7 @@
       <path refid="jboss/common.core.classpath"/>
       <path refid="jboss/common.logging.spi.classpath"/>
       <path refid="jboss/common.logging.log4j.classpath"/>
+      <path refid="jboss/jboss.vfs.classpath"/>
       <path refid="jboss.test.classpath"/>
     </path>
 

Modified: projects/microcontainer/trunk/container/src/tests/org/jboss/test/ContainerAllTestSuite.java
===================================================================
--- projects/microcontainer/trunk/container/src/tests/org/jboss/test/ContainerAllTestSuite.java	2006-12-19 20:59:28 UTC (rev 59158)
+++ projects/microcontainer/trunk/container/src/tests/org/jboss/test/ContainerAllTestSuite.java	2006-12-19 21:10:36 UTC (rev 59159)
@@ -29,7 +29,6 @@
 import org.jboss.test.classinfo.test.ClassInfoTestSuite;
 import org.jboss.test.joinpoint.test.JoinpointTestSuite;
 import org.jboss.test.metadata.MetaDataAllTestSuite;
-import org.jboss.test.virtual.test.VFSAllTestSuite;
 
 /**
  * All Test Suite.
@@ -52,7 +51,6 @@
       suite.addTest(JoinpointTestSuite.suite());
       suite.addTest(BeanInfoTestSuite.suite());
       suite.addTest(MetaDataAllTestSuite.suite());
-      suite.addTest(VFSAllTestSuite.suite());
       
       return suite;
    }

Modified: projects/microcontainer/trunk/deployers/.classpath
===================================================================
--- projects/microcontainer/trunk/deployers/.classpath	2006-12-19 20:59:28 UTC (rev 59158)
+++ projects/microcontainer/trunk/deployers/.classpath	2006-12-19 21:10:36 UTC (rev 59159)
@@ -14,5 +14,6 @@
 	<classpathentry kind="lib" path="/thirdparty/jboss/jbossxb/lib/jboss-xml-binding.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/kernel"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/dependency"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/jboss-vfs/lib/jboss-vfs.jar" sourcepath="/thirdparty/jboss/jboss-vfs/lib/jboss-vfs-sources.jar"/>
 	<classpathentry kind="output" path="output/eclipse-classes"/>
 </classpath>

Modified: projects/microcontainer/trunk/deployers/build.xml
===================================================================
--- projects/microcontainer/trunk/deployers/build.xml	2006-12-19 20:59:28 UTC (rev 59158)
+++ projects/microcontainer/trunk/deployers/build.xml	2006-12-19 21:10:36 UTC (rev 59159)
@@ -80,6 +80,7 @@
       <path refid="jboss.container.classpath"/>
       <path refid="jboss.dependency.classpath"/>
       <path refid="jboss.kernel.classpath"/>
+      <path refid="jboss/jboss.vfs.classpath"/>
     </path>
      
     <!-- ===== -->

Modified: projects/microcontainer/trunk/osgi-int/.classpath
===================================================================
--- projects/microcontainer/trunk/osgi-int/.classpath	2006-12-19 20:59:28 UTC (rev 59158)
+++ projects/microcontainer/trunk/osgi-int/.classpath	2006-12-19 21:10:36 UTC (rev 59159)
@@ -2,7 +2,7 @@
 <classpath>
 	<classpathentry kind="src" path="src/main"/>
 	<classpathentry kind="src" path="output/gen-parsers"/>
-	<classpathentry output="output/eclipse-classes-tests" kind="src" path="src/tests"/>
+	<classpathentry kind="src" output="output/eclipse-classes-tests" path="src/tests"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/common-core/lib/jboss-common-core.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi.jar"/>
@@ -14,8 +14,8 @@
 	<classpathentry kind="lib" path="/thirdparty/jboss/profiler/jvmti/lib/jboss-profiler-jvmti.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/test/lib/jboss-test.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/container"/>
 	<classpathentry kind="lib" path="/thirdparty/osgi/lib/osgi.compendium.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/osgi/lib/osgi.core.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/jboss-vfs/lib/jboss-vfs.jar" sourcepath="/thirdparty/jboss/jboss-vfs/lib/jboss-vfs-sources.jar"/>
 	<classpathentry kind="output" path="output/eclipse-classes"/>
 </classpath>

Modified: projects/microcontainer/trunk/osgi-int/build.xml
===================================================================
--- projects/microcontainer/trunk/osgi-int/build.xml	2006-12-19 20:59:28 UTC (rev 59158)
+++ projects/microcontainer/trunk/osgi-int/build.xml	2006-12-19 21:10:36 UTC (rev 59159)
@@ -75,6 +75,7 @@
       <path refid="jboss/common.core.classpath"/>
       <path refid="jboss/common.logging.spi.classpath"/>
       <path refid="jboss/common.logging.log4j.classpath"/>
+      <path refid="jboss/jboss.vfs.classpath"/>
       <path refid="jboss.test.classpath"/>
       <path refid="jboss.container.classpath"/>
     </path>