[jboss-cvs] JBossAS SVN: r84858 - in trunk: build and 25 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Fri Feb 27 01:33:44 EST 2009


Author: ALRubinger
Date: 2009-02-27 01:33:43 -0500 (Fri, 27 Feb 2009)
New Revision: 84858

Removed:
   trunk/bootstrap/
Modified:
   trunk/build/build-distr.xml
   trunk/build/build.xml
   trunk/cluster/.classpath
   trunk/cluster/pom.xml
   trunk/component-matrix/pom.xml
   trunk/connector/.classpath
   trunk/connector/build.xml
   trunk/console/.classpath
   trunk/console/build.xml
   trunk/deployment/.classpath
   trunk/ejb3/.classpath
   trunk/embedded/.classpath
   trunk/hibernate-int/.classpath
   trunk/iiop/.classpath
   trunk/iiop/build.xml
   trunk/main/.classpath
   trunk/main/build.xml
   trunk/main/pom.xml
   trunk/main/src/assembly/run.xml
   trunk/management/.classpath
   trunk/management/build.xml
   trunk/messaging/.classpath
   trunk/pom.xml
   trunk/profileservice/.classpath
   trunk/security/.classpath
   trunk/server/.classpath
   trunk/server/pom.xml
   trunk/server/src/assembly/shutdown.xml
   trunk/spring-int/.classpath
   trunk/system-jmx/.classpath
   trunk/system-jmx/pom.xml
   trunk/system/.classpath
   trunk/system/pom.xml
   trunk/testsuite/.classpath
   trunk/testsuite/build.xml
   trunk/thirdparty/pom.xml
   trunk/tomcat/.classpath
   trunk/tomcat/build.xml
   trunk/varia/.classpath
   trunk/varia/build.xml
   trunk/webservices/.classpath
Log:
[JBAS-6171] Remove "bootstrap" module from AS trunk, replaced w/ jboss-bootstrap

Modified: trunk/build/build-distr.xml
===================================================================
--- trunk/build/build-distr.xml	2009-02-27 06:32:23 UTC (rev 84857)
+++ trunk/build/build-distr.xml	2009-02-27 06:33:43 UTC (rev 84858)
@@ -367,34 +367,6 @@
     </copy>
   </target>
 
-  <!-- ========= -->
-  <!-- Bootstrap -->
-  <!-- ========= -->
-
-  <target name="_module-bootstrap-most">
-    <property name="_module.name" value="bootstrap" override="true"/>
-    <property name="_module.output" override="true" value="${project.root}/${_module.name}/output"/>
-
-    <!-- Copy the generated libraries -->
-    <mkdir dir="${install.lib}"/>
-    <copy todir="${install.lib}" filtering="no">
-      <fileset dir="${_module.output}/lib">
-        <include name="jboss-bootstrap.jar"/>
-      </fileset>
-    </copy>
-
-  </target>
-
-  <target name="_module-bootstrap-all" depends="_module-bootstrap-most">
-    <!-- Copy the generated javadocs -->
-    <mkdir dir="${install.api}/${_module.name}"/>
-    <copy todir="${install.api}/${_module.name}" filtering="no">
-      <fileset dir="${_module.output}/api">
-        <include name="**/*"/>
-      </fileset>
-    </copy>
-  </target>
-
   <!-- ====== -->
   <!-- System -->
   <!-- ====== -->
@@ -1859,6 +1831,8 @@
       <fileset dir="${jboss.aop.lib}">
         <include name="jboss-aop.jar"/>
       </fileset>
+      <fileset dir="${jboss.jboss.bootstrap.lib}" includes="*.jar"
+        excludes="*-sources.jar, *-javadoc.jar" />
       <fileset dir="${jboss.common.core.lib}">
         <exclude name="*-sources.jar"/>
       </fileset>

Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml	2009-02-27 06:32:23 UTC (rev 84857)
+++ trunk/build/build.xml	2009-02-27 06:33:43 UTC (rev 84858)
@@ -88,7 +88,6 @@
 
       <!-- Modules -->
       <module name="aspects"/>
-      <module name="bootstrap" externalBuild="true"/>
       <module name="cluster" externalBuild="true"/>
       <module name="connector"/>
       <module name="console"/>
@@ -124,7 +123,7 @@
       </group>
 
       <group name="core">
-        <include modules="bootstrap, main, system, system-jmx"/>
+        <include modules="main, system, system-jmx"/>
       </group>
 
       <group name="basic">
@@ -442,18 +441,6 @@
      <ant antfile="build-distr.xml" target="_module-main-all"/>
   </target>
 
-  <!-- ========= -->
-  <!-- Bootstrap -->
-  <!-- ========= -->
-
-  <target name="_module-bootstrap-most">
-     <ant antfile="build-distr.xml" target="_module-bootstrap-most"/>
-  </target>
-
-  <target name="_module-bootstrap-all" depends="_module-bootstrap-most">
-     <ant antfile="build-distr.xml" target="_module-bootstrap-all"/>
-  </target>
-
   <!-- ====== -->
   <!-- System -->
   <!-- ====== -->

Modified: trunk/cluster/.classpath
===================================================================
--- trunk/cluster/.classpath	2009-02-27 06:32:23 UTC (rev 84857)
+++ trunk/cluster/.classpath	2009-02-27 06:33:43 UTC (rev 84858)
@@ -9,9 +9,12 @@
 	<classpathentry exported="true" kind="lib" path="/thirdparty/org/jboss/cluster/lib/jboss-ha-client.jar" sourcepath="/thirdparty/org/jboss/cluster/lib/jboss-ha-client-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="/thirdparty/org/jboss/cluster/lib/jboss-ha-server-api.jar" sourcepath="/thirdparty/org/jboss/cluster/lib/jboss-ha-server-api-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="/thirdparty/org/jboss/cluster/lib/jboss-ha-server-cache-spi.jar" sourcepath="/thirdparty/org/jboss/cluster/lib/jboss-ha-server-cache-spi-sources.jar"/>
-   <classpathentry exported="true" kind="lib" path="/thirdparty/org/jboss/cluster/lib/jboss-ha-server-cache-jbc.jar" sourcepath="/thirdparty/org/jboss/cluster/lib/jboss-ha-server-cache-jbc-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="/thirdparty/org/jboss/cluster/lib/jboss-ha-server-cache-jbc.jar" sourcepath="/thirdparty/org/jboss/cluster/lib/jboss-ha-server-cache-jbc-sources.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/profileservice-spi/lib/jboss-profileservice-spi.jar" sourcepath="/thirdparty/jboss/profileservice-spi/lib/jboss-profileservice-spi-sources.jar"/>
-	<!--<classpathentry exported="true" kind="lib" path="/thirdparty/jboss/cache/jbosscache-core/lib/jbosscache-core.jar" sourcepath="/jbosscache-core/src/main/java"/>
-	<classpathentry exported="true" kind="lib" path="/thirdparty/jboss/cache/jbosscache-pojo/lib/jbosscache-pojo.jar" sourcepath="/thirdparty/jboss/cache/jbosscache-pojo/lib/jbosscache-pojo-sources.jar"/>-->
+	<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-kernel.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-kernel-sources.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/common-core/lib/jboss-common-core.jar" sourcepath="/thirdparty/jboss/common-core/lib/jboss-common-core-sources.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-dependency.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-dependency-sources.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/jboss-bootstrap/lib/jboss-bootstrap.jar"/>
 	<classpathentry kind="output" path="output/eclipse-classes"/>
 </classpath>

Modified: trunk/cluster/pom.xml
===================================================================
--- trunk/cluster/pom.xml	2009-02-27 06:32:23 UTC (rev 84857)
+++ trunk/cluster/pom.xml	2009-02-27 06:33:43 UTC (rev 84858)
@@ -224,8 +224,8 @@
     </dependency>
     
     <dependency>
-      <groupId>org.jboss.jbossas</groupId>
-      <artifactId>jboss-as-bootstrap</artifactId>
+      <groupId>org.jboss.bootstrap</groupId>
+      <artifactId>jboss-bootstrap</artifactId>
     </dependency>
     
     <dependency>

Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml	2009-02-27 06:32:23 UTC (rev 84857)
+++ trunk/component-matrix/pom.xml	2009-02-27 06:33:43 UTC (rev 84858)
@@ -51,6 +51,7 @@
     <version.org.jboss.aspects.remoting>1.0.1.GA</version.org.jboss.aspects.remoting>
     <version.org.jboss.aspects.security>1.0.0.GA</version.org.jboss.aspects.security>
     <version.org.jboss.aspects.transaction>1.0.0.GA</version.org.jboss.aspects.transaction>
+    <version.org.jboss.bootstrap>1.0.0-Alpha-1</version.org.jboss.bootstrap>
     <version.org.jboss.cache.core>3.0.3.CR1</version.org.jboss.cache.core>
     <version.org.jboss.cache.pojo>3.0.0.GA</version.org.jboss.cache.pojo>
     <version.org.jboss.cl>2.0.3.GA</version.org.jboss.cl>
@@ -134,6 +135,7 @@
                     <exclude>xml-apis:xml-apis</exclude>
                     <exclude>com.sun.xml.fastinfoset:FastInfoset</exclude>
                     <exclude>sun-jaxws:FastInfoset</exclude>
+                    <exclude>org.jboss.jbossas:jboss-as-bootstrap</exclude> <!-- org.jboss.bootstrap:jboss-bootstrap JBAS-6171 -->
                   </excludes>
                 </bannedDependencies>
               </rules>
@@ -1755,6 +1757,12 @@
           </exclusion>
         </exclusions>
       </dependency>
+
+      <dependency>
+        <groupId>org.jboss.bootstrap</groupId>
+        <artifactId>jboss-bootstrap</artifactId>
+        <version>${version.org.jboss.bootstrap}</version>
+      </dependency>
       
       <dependency>
         <groupId>org.jboss.javaee</groupId>

Modified: trunk/connector/.classpath
===================================================================
--- trunk/connector/.classpath	2009-02-27 06:32:23 UTC (rev 84857)
+++ trunk/connector/.classpath	2009-02-27 06:33:43 UTC (rev 84858)
@@ -16,5 +16,14 @@
 	<classpathentry kind="lib" path="/thirdparty/jboss/jboss-man/lib/jboss-managed.jar" sourcepath="/thirdparty/jboss/jboss-man/lib/jboss-managed-sources.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/sun-jaf/lib/activation.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/profileservice-spi/lib/jboss-profileservice-spi.jar" sourcepath="/thirdparty/jboss/profileservice-spi/lib/jboss-profileservice-spi-sources.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-kernel.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-kernel-sources.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/jboss-reflect/lib/jboss-reflect.jar" sourcepath="/thirdparty/jboss/jboss-reflect/lib/jboss-reflect-sources.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/jbossxb/lib/jboss-xml-binding.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/jboss-mdr/lib/jboss-mdr.jar" sourcepath="/thirdparty/jboss/jboss-mdr/lib/jboss-mdr-sources.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-dependency.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-dependency-sources.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/common-core/lib/jboss-common-core.jar" sourcepath="/thirdparty/jboss/common-core/lib/jboss-common-core-sources.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/common-logging-log4j/lib/jboss-logging-log4j.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/jboss-bootstrap/lib/jboss-bootstrap.jar"/>
 	<classpathentry kind="output" path="output/eclipse-classes"/>
 </classpath>

Modified: trunk/connector/build.xml
===================================================================
--- trunk/connector/build.xml	2009-02-27 06:32:23 UTC (rev 84857)
+++ trunk/connector/build.xml	2009-02-27 06:33:43 UTC (rev 84858)
@@ -111,7 +111,7 @@
       <path refid="jboss.jboss.security.spi.classpath"/>
       <path refid="jboss.security.int.classpath"/>
       <path refid="jboss.server.classpath"/>
-      <path refid="jboss.bootstrap.classpath"/>
+      <path refid="jboss.jboss.bootstrap.classpath"/>
       <path refid="jboss.system.classpath"/>
       <path refid="jboss.systemjmx.classpath"/>
       <path refid="jboss.mx.classpath"/>

Modified: trunk/console/.classpath
===================================================================
--- trunk/console/.classpath	2009-02-27 06:32:23 UTC (rev 84857)
+++ trunk/console/.classpath	2009-02-27 06:33:43 UTC (rev 84858)
@@ -10,5 +10,9 @@
 	<classpathentry kind="lib" path="/thirdparty/jboss/aop/lib/jboss-aop.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/web/lib/jsp-api.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/web/lib/servlet-api.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-kernel.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-kernel-sources.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/jboss-bootstrap/lib/jboss-bootstrap.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/common-core/lib/jboss-common-core.jar" sourcepath="/thirdparty/jboss/common-core/lib/jboss-common-core-sources.jar"/>
 	<classpathentry kind="output" path="output/eclipse-classes"/>
 </classpath>

Modified: trunk/console/build.xml
===================================================================
--- trunk/console/build.xml	2009-02-27 06:32:23 UTC (rev 84857)
+++ trunk/console/build.xml	2009-02-27 06:33:43 UTC (rev 84858)
@@ -99,7 +99,7 @@
       <path refid="jboss.jbosssx.classpath"/>
       <path refid="jboss.server.classpath"/>
       <path refid="jboss.mq.classpath"/>
-      <path refid="jboss.bootstrap.classpath"/>
+      <path refid="jboss.jboss.bootstrap.classpath"/>
       <path refid="jboss.system.classpath"/>
       <path refid="jboss.systemjmx.classpath"/>
       <path refid="jboss.varia.classpath"/>

Modified: trunk/deployment/.classpath
===================================================================
--- trunk/deployment/.classpath	2009-02-27 06:32:23 UTC (rev 84857)
+++ trunk/deployment/.classpath	2009-02-27 06:33:43 UTC (rev 84858)
@@ -5,5 +5,8 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry exported="true" kind="lib" path="/thirdparty/jboss/remoting/lib/jboss-remoting.jar"/>
 	<classpathentry exported="true" 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/common-logging-spi/lib/jboss-logging-spi.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/common-core/lib/jboss-common-core.jar" sourcepath="/thirdparty/jboss/common-core/lib/jboss-common-core-sources.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-dependency.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-dependency-sources.jar"/>
 	<classpathentry kind="output" path="output/eclipse-classes"/>
 </classpath>

Modified: trunk/ejb3/.classpath
===================================================================
--- trunk/ejb3/.classpath	2009-02-27 06:32:23 UTC (rev 84857)
+++ trunk/ejb3/.classpath	2009-02-27 06:33:43 UTC (rev 84858)
@@ -27,5 +27,7 @@
 	<classpathentry kind="lib" path="/thirdparty/jboss/aop/lib/jboss-aop.jar" sourcepath="/thirdparty/jboss/aop/lib/jboss-aop-sources.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/jboss-ejb3-proxy/lib/jboss-ejb3-proxy.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/jboss-ejb3-timerservice-spi/lib/jboss-ejb3-timerservice-spi.jar" sourcepath="/thirdparty/jboss/jboss-ejb3-timerservice-spi/lib/jboss-ejb3-timerservice-spi-sources.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-dependency.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-dependency-sources.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/jbossxb/lib/jboss-xml-binding.jar"/>
 	<classpathentry kind="output" path="output/eclipse-classes"/>
 </classpath>

Modified: trunk/embedded/.classpath
===================================================================
--- trunk/embedded/.classpath	2009-02-27 06:32:23 UTC (rev 84857)
+++ trunk/embedded/.classpath	2009-02-27 06:33:43 UTC (rev 84858)
@@ -38,7 +38,6 @@
 	<classpathentry kind="lib" path="/thirdparty/jboss/jbossts/lib/jbossts-common.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/jbossts/lib/jbossjta-integration.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/main"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/bootstrap"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/varia"/>
 	<classpathentry kind="lib" path="/thirdparty/hibernate-commons-annotations/lib/hibernate-commons-annotations.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/hibernate-entitymanager/lib/hibernate-entitymanager.jar"/>
@@ -50,5 +49,6 @@
 	<classpathentry kind="lib" path="/thirdparty/jboss/jboss-ejb3-core/lib/jboss-ejb3-core.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/org/jboss/aspects/lib/jboss-security-aspects.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/aop/lib/jboss-aop.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/jboss-bootstrap/lib/jboss-bootstrap.jar"/>
 	<classpathentry kind="output" path="output/classes"/>
 </classpath>

Modified: trunk/hibernate-int/.classpath
===================================================================
--- trunk/hibernate-int/.classpath	2009-02-27 06:32:23 UTC (rev 84857)
+++ trunk/hibernate-int/.classpath	2009-02-27 06:33:43 UTC (rev 84858)
@@ -7,5 +7,10 @@
 	<classpathentry kind="lib" path="/thirdparty/hibernate/lib/hibernate-jmx.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/org/hibernate/lib/hibernate-jbosscache2.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/cache/jbosscache-core/lib/jbosscache-core.jar" sourcepath="/thirdparty/jboss/cache/jbosscache-core/lib/jbosscache-core-sources.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-kernel.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-kernel-sources.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-dependency.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-dependency-sources.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/common-core/lib/jboss-common-core.jar" sourcepath="/thirdparty/jboss/common-core/lib/jboss-common-core-sources.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/jbossxb/lib/jboss-xml-binding.jar"/>
 	<classpathentry kind="output" path="output/eclipse-classes"/>
 </classpath>

Modified: trunk/iiop/.classpath
===================================================================
--- trunk/iiop/.classpath	2009-02-27 06:32:23 UTC (rev 84857)
+++ trunk/iiop/.classpath	2009-02-27 06:33:43 UTC (rev 84858)
@@ -6,5 +6,10 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry exported="true" kind="lib" path="/thirdparty/jacorb/lib/jacorb.jar"/>
 	<classpathentry exported="true" kind="lib" path="/thirdparty/apache-avalon/lib/avalon-framework.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/common-core/lib/jboss-common-core.jar" sourcepath="/thirdparty/jboss/common-core/lib/jboss-common-core-sources.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-kernel.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-kernel-sources.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/common-logging-log4j/lib/jboss-logging-log4j.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/jboss-bootstrap/lib/jboss-bootstrap.jar"/>
 	<classpathentry kind="output" path="output/eclipse-classes"/>
 </classpath>

Modified: trunk/iiop/build.xml
===================================================================
--- trunk/iiop/build.xml	2009-02-27 06:32:23 UTC (rev 84857)
+++ trunk/iiop/build.xml	2009-02-27 06:33:43 UTC (rev 84858)
@@ -97,7 +97,7 @@
       <path refid="jboss.common.logging.spi.classpath"/>
       <path refid="jboss.common.logging.log4j.classpath"/>
       <path refid="jboss.common.logging.jdk.classpath"/>
-      <path refid="jboss.bootstrap.classpath"/>
+      <path refid="jboss.jboss.bootstrap.classpath"/>
     	<path refid="jboss.main.classpath"/>
       <path refid="jboss.system.classpath"/>
       <path refid="jboss.systemjmx.classpath"/>

Modified: trunk/main/.classpath
===================================================================
--- trunk/main/.classpath	2009-02-27 06:32:23 UTC (rev 84857)
+++ trunk/main/.classpath	2009-02-27 06:33:43 UTC (rev 84858)
@@ -3,6 +3,6 @@
 	<classpathentry kind="src" path="src/main"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry exported="true" kind="lib" path="/thirdparty/gnu-getopt/lib/getopt.jar"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/bootstrap"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/jboss-bootstrap/lib/jboss-bootstrap.jar"/>
 	<classpathentry kind="output" path="output/eclipse-classes"/>
 </classpath>

Modified: trunk/main/build.xml
===================================================================
--- trunk/main/build.xml	2009-02-27 06:32:23 UTC (rev 84857)
+++ trunk/main/build.xml	2009-02-27 06:33:43 UTC (rev 84858)
@@ -78,7 +78,7 @@
 
     <!-- The combined dependant module classpath -->
     <path id="dependentmodule.classpath">
-    	<path refid="jboss.bootstrap.classpath"/>
+    	<path refid="jboss.jboss.bootstrap.classpath"/>
     </path>
 
     <!-- ===== -->
@@ -157,7 +157,7 @@
   	<property name="inflated.dir" value="tmp-bootstrap" />
   	<mkdir dir="${inflated.dir}"/>
   	<unjar dest="${inflated.dir}">
-  	  <fileset dir="../bootstrap/output/lib">
+  	  <fileset dir="${jboss.jboss.bootstrap.lib}">
   	    <include name="jboss-bootstrap.jar"/>
   	  </fileset>
     </unjar>

Modified: trunk/main/pom.xml
===================================================================
--- trunk/main/pom.xml	2009-02-27 06:32:23 UTC (rev 84857)
+++ trunk/main/pom.xml	2009-02-27 06:33:43 UTC (rev 84858)
@@ -4,6 +4,7 @@
     <groupId>org.jboss.jbossas</groupId>
     <artifactId>jboss-as-parent</artifactId>
     <version>6.0.0-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.jboss.jbossas</groupId>
@@ -162,8 +163,8 @@
   <dependencies>
     <!-- Compile (global dependencies) -->
     <dependency>
-      <groupId>org.jboss.jbossas</groupId>
-      <artifactId>jboss-as-bootstrap</artifactId>
+      <groupId>org.jboss.bootstrap</groupId>
+      <artifactId>jboss-bootstrap</artifactId>
     </dependency>
     <dependency>
       <groupId>gnu-getopt</groupId>

Modified: trunk/main/src/assembly/run.xml
===================================================================
--- trunk/main/src/assembly/run.xml	2009-02-27 06:32:23 UTC (rev 84857)
+++ trunk/main/src/assembly/run.xml	2009-02-27 06:33:43 UTC (rev 84858)
@@ -34,7 +34,7 @@
         </includes>
       </unpackOptions>
       <includes>
-        <include>org.jboss.jbossas:jboss-as-bootstrap</include>
+        <include>org.jboss.bootstrap:jboss-bootstrap</include>
       </includes>
     </dependencySet>
     <dependencySet>
@@ -44,4 +44,4 @@
       </includes>
     </dependencySet>
   </dependencySets>
-</assembly>
\ No newline at end of file
+</assembly>

Modified: trunk/management/.classpath
===================================================================
--- trunk/management/.classpath	2009-02-27 06:32:23 UTC (rev 84857)
+++ trunk/management/.classpath	2009-02-27 06:33:43 UTC (rev 84858)
@@ -4,5 +4,9 @@
 	<classpathentry exported="true" kind="src" path="/connector"/>
 	<classpathentry exported="true" kind="src" path="/cluster"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-kernel.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-kernel-sources.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/common-core/lib/jboss-common-core.jar" sourcepath="/thirdparty/jboss/common-core/lib/jboss-common-core-sources.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/jboss-bootstrap/lib/jboss-bootstrap.jar"/>
 	<classpathentry kind="output" path="output/eclipse-classes"/>
 </classpath>

Modified: trunk/management/build.xml
===================================================================
--- trunk/management/build.xml	2009-02-27 06:32:23 UTC (rev 84857)
+++ trunk/management/build.xml	2009-02-27 06:33:43 UTC (rev 84858)
@@ -112,7 +112,7 @@
       <path refid="jboss.cluster.classpath"/>
       <path refid="jboss.jca.classpath"/>
       <path refid="jboss.server.classpath"/>
-      <path refid="jboss.bootstrap.classpath"/>
+      <path refid="jboss.jboss.bootstrap.classpath"/>
       <path refid="jboss.system.classpath"/>
       <path refid="jboss.systemjmx.classpath"/>
       <path refid="jboss.mx.classpath"/>

Modified: trunk/messaging/.classpath
===================================================================
--- trunk/messaging/.classpath	2009-02-27 06:32:23 UTC (rev 84857)
+++ trunk/messaging/.classpath	2009-02-27 06:33:43 UTC (rev 84858)
@@ -4,5 +4,8 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry exported="true" kind="src" path="/server"/>
 	<classpathentry exported="true" kind="lib" path="/thirdparty/jboss/messaging/lib/jboss-messaging.jar" sourcepath="/thirdparty/jboss/messaging/lib/jboss-messaging-sources.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/jboss-mdr/lib/jboss-mdr.jar" sourcepath="/thirdparty/jboss/jboss-mdr/lib/jboss-mdr-sources.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/common-core/lib/jboss-common-core.jar" sourcepath="/thirdparty/jboss/common-core/lib/jboss-common-core-sources.jar"/>
 	<classpathentry kind="output" path="output/eclipse-classes"/>
 </classpath>

Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml	2009-02-27 06:32:23 UTC (rev 84857)
+++ trunk/pom.xml	2009-02-27 06:33:43 UTC (rev 84858)
@@ -4,7 +4,7 @@
     <groupId>org.jboss.jbossas</groupId>
     <artifactId>jboss-as-component-matrix</artifactId>
     <version>6.0.0-SNAPSHOT</version>
-    <relativePath>component-matrix</relativePath>
+    <relativePath>component-matrix/pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.jboss.jbossas</groupId>
@@ -158,11 +158,6 @@
       </dependency>
       <dependency>
         <groupId>org.jboss.jbossas</groupId>
-        <artifactId>jboss-as-bootstrap</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.jboss.jbossas</groupId>
         <artifactId>jboss-as-cluster</artifactId>
         <version>${project.version}</version>
       </dependency>
@@ -361,7 +356,6 @@
       </activation>
       <modules>
         <module>component-matrix</module>
-        <module>bootstrap</module>
         <module>main</module>
         <module>system</module>
         <module>system-jmx</module>
@@ -407,7 +401,6 @@
       <id>integrated-build</id>
       <modules>
         <module>component-matrix</module>
-        <module>bootstrap</module>
         <module>main</module>
         <module>system</module>
         <module>system-jmx</module>

Modified: trunk/profileservice/.classpath
===================================================================
--- trunk/profileservice/.classpath	2009-02-27 06:32:23 UTC (rev 84857)
+++ trunk/profileservice/.classpath	2009-02-27 06:33:43 UTC (rev 84858)
@@ -17,5 +17,7 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/aop/lib/jboss-aop.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/jboss-security-spi/lib/jboss-security-spi.jar" sourcepath="/thirdparty/jboss/jboss-security-spi/lib/jboss-security-spi-sources.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-kernel.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-kernel-sources.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-dependency.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-dependency-sources.jar"/>
 	<classpathentry kind="output" path="output/eclipse-classes"/>
 </classpath>

Modified: trunk/security/.classpath
===================================================================
--- trunk/security/.classpath	2009-02-27 06:32:23 UTC (rev 84857)
+++ trunk/security/.classpath	2009-02-27 06:33:43 UTC (rev 84858)
@@ -10,5 +10,8 @@
 	<classpathentry exported="true" 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/junit/lib/junit.jar" sourcepath="/thirdparty/junit/lib/junit-src.zip"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/jnp-client/lib/jnp-client.jar" sourcepath="/thirdparty/jboss/jnpserver/lib/jnpserver-sources.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/common-core/lib/jboss-common-core.jar" sourcepath="/thirdparty/jboss/common-core/lib/jboss-common-core-sources.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-kernel.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-kernel-sources.jar"/>
 	<classpathentry kind="output" path="output/eclipse-classes"/>
 </classpath>

Modified: trunk/server/.classpath
===================================================================
--- trunk/server/.classpath	2009-02-27 06:32:23 UTC (rev 84857)
+++ trunk/server/.classpath	2009-02-27 06:33:43 UTC (rev 84858)
@@ -19,5 +19,12 @@
 	<classpathentry kind="lib" path="/thirdparty/jboss/serialization/lib/jboss-serialization.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/web/lib/servlet-api.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/apache-bcel/lib/bcel.jar" sourcepath="/thirdparty/apache-bcel/lib/bcel-sources.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/common-core/lib/jboss-common-core.jar" sourcepath="/thirdparty/jboss/common-core/lib/jboss-common-core-sources.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-dependency.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-dependency-sources.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/jbossxb/lib/jboss-xml-binding.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-kernel.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-kernel-sources.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/jboss-bootstrap/lib/jboss-bootstrap.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/common-logging-log4j/lib/jboss-logging-log4j.jar"/>
 	<classpathentry kind="output" path="output/eclipse-classes"/>
 </classpath>

Modified: trunk/server/pom.xml
===================================================================
--- trunk/server/pom.xml	2009-02-27 06:32:23 UTC (rev 84857)
+++ trunk/server/pom.xml	2009-02-27 06:33:43 UTC (rev 84858)
@@ -301,8 +301,8 @@
     </dependency>
     
     <dependency>
-      <groupId>org.jboss.jbossas</groupId>
-      <artifactId>jboss-as-bootstrap</artifactId>
+      <groupId>org.jboss.bootstrap</groupId>
+      <artifactId>jboss-bootstrap</artifactId>
     </dependency>
     
     <dependency>

Modified: trunk/server/src/assembly/shutdown.xml
===================================================================
--- trunk/server/src/assembly/shutdown.xml	2009-02-27 06:32:23 UTC (rev 84857)
+++ trunk/server/src/assembly/shutdown.xml	2009-02-27 06:33:43 UTC (rev 84858)
@@ -35,7 +35,7 @@
         </includes>
       </unpackOptions>
       <includes>
-        <include>org.jboss.jbossas:jboss-as-bootstrap</include>
+        <include>org.jboss.bootstrap:jboss-bootstrap</include>
       </includes>
     </dependencySet>
     <dependencySet>
@@ -45,4 +45,4 @@
       </includes>
     </dependencySet>
   </dependencySets>
-</assembly>
\ No newline at end of file
+</assembly>

Modified: trunk/spring-int/.classpath
===================================================================
--- trunk/spring-int/.classpath	2009-02-27 06:32:23 UTC (rev 84857)
+++ trunk/spring-int/.classpath	2009-02-27 06:33:43 UTC (rev 84858)
@@ -16,5 +16,10 @@
 	<classpathentry exported="true" kind="lib" path="/thirdparty/jboss/cache/jbosscache-core/lib/jbosscache-core.jar" sourcepath="/jbosscache-core/src/main/java"/>
 	<classpathentry exported="true" kind="lib" path="/thirdparty/jboss/cache/jbosscache-pojo/lib/jbosscache-pojo.jar" sourcepath="/thirdparty/jboss/cache/jbosscache-pojo/lib/jbosscache-pojo-sources.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/web/lib/servlet-api.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-kernel.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-kernel-sources.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-dependency.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-dependency-sources.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/common-core/lib/jboss-common-core.jar" sourcepath="/thirdparty/jboss/common-core/lib/jboss-common-core-sources.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/jboss-reflect/lib/jboss-reflect.jar" sourcepath="/thirdparty/jboss/jboss-reflect/lib/jboss-reflect-sources.jar"/>
 	<classpathentry kind="output" path="output/eclipse-classes"/>
 </classpath>

Modified: trunk/system/.classpath
===================================================================
--- trunk/system/.classpath	2009-02-27 06:32:23 UTC (rev 84857)
+++ trunk/system/.classpath	2009-02-27 06:33:43 UTC (rev 84858)
@@ -3,7 +3,6 @@
 	<classpathentry kind="src" path="src/main"/>
 	<classpathentry kind="src" output="output/eclipse-test-classes" path="src/tests"/>
 	<classpathentry kind="src" output="output/eclipse-test-classes" path="src/tests-support"/>
-	<classpathentry exported="true" kind="src" path="/bootstrap"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry exported="true" kind="lib" path="/thirdparty/apache-log4j/lib/log4j.jar"/>
 	<classpathentry exported="true" kind="lib" path="/thirdparty/oswego-concurrent/lib/concurrent.jar"/>
@@ -32,5 +31,13 @@
 	<classpathentry kind="lib" path="/thirdparty/jboss/jboss-deployers/lib/jboss-deployers-client.jar" sourcepath="/thirdparty/jboss/jboss-deployers/lib/jboss-deployers-client-sources.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/sun-jaxb/lib/jaxb-impl.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/sun-jaf/lib/activation.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/jboss-mdr/lib/jboss-mdr.jar" sourcepath="/thirdparty/jboss/jboss-mdr/lib/jboss-mdr-sources.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-dependency.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-dependency-sources.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/common-core/lib/jboss-common-core.jar" sourcepath="/thirdparty/jboss/common-core/lib/jboss-common-core-sources.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/jboss-reflect/lib/jboss-reflect.jar" sourcepath="/thirdparty/jboss/jboss-reflect/lib/jboss-reflect-sources.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-kernel.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-kernel-sources.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/jboss-bootstrap/lib/jboss-bootstrap.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/jbossxb/lib/jboss-xml-binding.jar"/>
 	<classpathentry kind="output" path="output/eclipse-classes"/>
 </classpath>

Modified: trunk/system/pom.xml
===================================================================
--- trunk/system/pom.xml	2009-02-27 06:32:23 UTC (rev 84857)
+++ trunk/system/pom.xml	2009-02-27 06:33:43 UTC (rev 84858)
@@ -192,8 +192,8 @@
       <artifactId>jboss-aop-mc-int</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.jboss.jbossas</groupId>
-      <artifactId>jboss-as-bootstrap</artifactId>
+      <groupId>org.jboss.bootstrap</groupId>
+      <artifactId>jboss-bootstrap</artifactId>
     </dependency>
     <dependency>
       <groupId>org.jboss</groupId>

Modified: trunk/system-jmx/.classpath
===================================================================
--- trunk/system-jmx/.classpath	2009-02-27 06:32:23 UTC (rev 84857)
+++ trunk/system-jmx/.classpath	2009-02-27 06:33:43 UTC (rev 84858)
@@ -25,5 +25,13 @@
 	<classpathentry kind="lib" path="/thirdparty/jboss/jboss-deployers/lib/jboss-deployers-core.jar" sourcepath="/thirdparty/jboss/jboss-deployers/lib/jboss-deployers-core-sources.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/jboss-deployers/lib/jboss-deployers-impl.jar" sourcepath="/thirdparty/jboss/jboss-deployers/lib/jboss-deployers-impl-sources.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/jboss-deployers/lib/jboss-deployers-vfs.jar" sourcepath="/thirdparty/jboss/jboss-deployers/lib/jboss-deployers-vfs-sources.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/common-core/lib/jboss-common-core.jar" sourcepath="/thirdparty/jboss/common-core/lib/jboss-common-core-sources.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/jboss-mdr/lib/jboss-mdr.jar" sourcepath="/thirdparty/jboss/jboss-mdr/lib/jboss-mdr-sources.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/jboss-reflect/lib/jboss-reflect.jar" sourcepath="/thirdparty/jboss/jboss-reflect/lib/jboss-reflect-sources.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-dependency.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-dependency-sources.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-kernel.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-kernel-sources.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/jboss-bootstrap/lib/jboss-bootstrap.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/jbossxb/lib/jboss-xml-binding.jar"/>
 	<classpathentry kind="output" path="output/eclipse-classes"/>
 </classpath>

Modified: trunk/system-jmx/pom.xml
===================================================================
--- trunk/system-jmx/pom.xml	2009-02-27 06:32:23 UTC (rev 84857)
+++ trunk/system-jmx/pom.xml	2009-02-27 06:33:43 UTC (rev 84858)
@@ -168,8 +168,8 @@
       <artifactId>jboss-j2se</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.jboss.jbossas</groupId>
-      <artifactId>jboss-as-bootstrap</artifactId>
+      <groupId>org.jboss.bootstrap</groupId>
+      <artifactId>jboss-bootstrap</artifactId>
     </dependency>
     <dependency>
       <groupId>org.jboss.jbossas</groupId>

Modified: trunk/testsuite/.classpath
===================================================================
--- trunk/testsuite/.classpath	2009-02-27 06:32:23 UTC (rev 84857)
+++ trunk/testsuite/.classpath	2009-02-27 06:33:43 UTC (rev 84858)
@@ -4,7 +4,7 @@
 	<classpathentry kind="src" path="output/gen-src"/>
 	<classpathentry kind="lib" path="src/resources"/>
 	<classpathentry kind="src" path="/aspects"/>
-    <classpathentry kind="src" path="/cluster"/>
+	<classpathentry kind="src" path="/cluster"/>
 	<classpathentry kind="src" path="/deployment"/>
 	<classpathentry kind="src" path="/ejb3"/>
 	<classpathentry kind="src" path="/hibernate-int"/>
@@ -51,6 +51,11 @@
 	<classpathentry kind="lib" path="output/resources/security"/>
 	<classpathentry kind="lib" path="/thirdparty/org/jboss/ws/lib/jbossws-spi.jar" sourcepath="/thirdparty/org/jboss/ws/lib/jbossws-spi-sources.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/org/jboss/ws/lib/jbossws-common.jar" sourcepath="/thirdparty/org/jboss/ws/lib/jbossws-common-src.zip"/>
-   <classpathentry kind="lib" path="/thirdparty/org/easymock/lib/easymock.jar" sourcepath="/thirdparty/org/easymock/lib/easymock-sources.jar"/>
-   <classpathentry kind="output" path="output/eclipse-classes"/>
+	<classpathentry kind="lib" path="/thirdparty/org/easymock/lib/easymock.jar" sourcepath="/thirdparty/org/easymock/lib/easymock-sources.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/jbossxb/lib/jboss-xml-binding.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-kernel.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-kernel-sources.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-dependency.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-dependency-sources.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/jboss-bootstrap/lib/jboss-bootstrap.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/common-logging-log4j/lib/jboss-logging-log4j.jar"/>
+	<classpathentry kind="output" path="output/eclipse-classes"/>
 </classpath>

Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml	2009-02-27 06:32:23 UTC (rev 84857)
+++ trunk/testsuite/build.xml	2009-02-27 06:33:43 UTC (rev 84858)
@@ -241,7 +241,7 @@
       <path refid="jboss.security.int.classpath"/>
       <path refid="jboss.server.classpath"/>
       <path refid="jboss.main.classpath"/>
-      <path refid="jboss.bootstrap.classpath"/>
+      <path refid="jboss.jboss.bootstrap.classpath"/>
       <path refid="jboss.system.classpath"/>
       <path refid="jboss.systemjmx.classpath"/>
       <path refid="jboss.test.classpath"/>

Modified: trunk/thirdparty/pom.xml
===================================================================
--- trunk/thirdparty/pom.xml	2009-02-27 06:32:23 UTC (rev 84857)
+++ trunk/thirdparty/pom.xml	2009-02-27 06:33:43 UTC (rev 84858)
@@ -586,6 +586,13 @@
               </mapping>
             </dependency>
             <dependency>
+              <groupId>org.jboss.bootstrap</groupId>
+              <artifactId>jboss-bootstrap</artifactId>
+              <mapping>
+                <componentId>jboss.jboss-bootstrap</componentId>
+              </mapping>
+            </dependency>
+            <dependency>
               <groupId>org.jboss.jpa</groupId>
               <artifactId>jboss-jpa-deployers</artifactId>
               <mapping>
@@ -1424,6 +1431,10 @@
       <classifier>client</classifier>
     </dependency>
     <dependency>
+      <groupId>org.jboss.bootstrap</groupId>
+      <artifactId>jboss-bootstrap</artifactId>
+    </dependency>
+    <dependency>
       <groupId>org.jboss.cluster</groupId>
       <artifactId>jboss-ha-client</artifactId>
     </dependency>

Modified: trunk/tomcat/.classpath
===================================================================
--- trunk/tomcat/.classpath	2009-02-27 06:32:23 UTC (rev 84857)
+++ trunk/tomcat/.classpath	2009-02-27 06:33:43 UTC (rev 84858)
@@ -27,5 +27,9 @@
 	<classpathentry combineaccessrules="false" kind="src" path="/cluster"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/jboss-jpa-deployers/lib/jboss-jpa-deployers.jar" sourcepath="/thirdparty/jboss/jboss-jpa-deployers/lib/jboss-jpa-deployers-sources.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/aop/lib/jboss-aop.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-kernel.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-kernel-sources.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-dependency.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-dependency-sources.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/jbossxb/lib/jboss-xml-binding.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/jboss-bootstrap/lib/jboss-bootstrap.jar"/>
 	<classpathentry kind="output" path="output/eclipse-classes"/>
 </classpath>

Modified: trunk/tomcat/build.xml
===================================================================
--- trunk/tomcat/build.xml	2009-02-27 06:32:23 UTC (rev 84857)
+++ trunk/tomcat/build.xml	2009-02-27 06:33:43 UTC (rev 84858)
@@ -90,7 +90,7 @@
       <path refid="hibernate.entitymanager.classpath"/>
       <path refid="jboss.jboss.javaee.classpath"/>
       <path refid="jboss.jboss.jaspi.api.classpath"/>
-      <path refid="jboss.bootstrap.classpath"/>
+      <path refid="jboss.jboss.bootstrap.classpath"/>
       <path refid="jboss.system.classpath"/>
       <path refid="jboss.systemjmx.classpath"/>
       <path refid="jboss.jboss.security.spi.classpath"/>

Modified: trunk/varia/.classpath
===================================================================
--- trunk/varia/.classpath	2009-02-27 06:32:23 UTC (rev 84857)
+++ trunk/varia/.classpath	2009-02-27 06:33:43 UTC (rev 84858)
@@ -22,5 +22,12 @@
 	<classpathentry kind="lib" path="/thirdparty/jboss/jboss-deployers/lib/jboss-deployers-client.jar" sourcepath="/thirdparty/jboss/jboss-deployers/lib/jboss-deployers-client-sources.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/junit/lib/junit.jar" sourcepath="/thirdparty/junit/lib/junit-src.zip"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/web/lib/servlet-api.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/common-core/lib/jboss-common-core.jar" sourcepath="/thirdparty/jboss/common-core/lib/jboss-common-core-sources.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-kernel.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-kernel-sources.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/jboss-bootstrap/lib/jboss-bootstrap.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-dependency.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-dependency-sources.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/common-logging-log4j/lib/jboss-logging-log4j.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/jbossxb/lib/jboss-xml-binding.jar"/>
 	<classpathentry kind="output" path="output/eclipse-classes"/>
 </classpath>

Modified: trunk/varia/build.xml
===================================================================
--- trunk/varia/build.xml	2009-02-27 06:32:23 UTC (rev 84857)
+++ trunk/varia/build.xml	2009-02-27 06:33:43 UTC (rev 84858)
@@ -116,7 +116,7 @@
       <path refid="jboss.common.logging.log4j.classpath"/>
       <path refid="jboss.common.logging.jdk.classpath"/>
       <path refid="jboss.cluster.classpath"/>
-      <path refid="jboss.bootstrap.classpath"/>
+      <path refid="jboss.jboss.bootstrap.classpath"/>
       <path refid="jboss.system.classpath"/>
       <path refid="jboss.systemjmx.classpath"/>
       <path refid="jboss.mx.classpath"/>

Modified: trunk/webservices/.classpath
===================================================================
--- trunk/webservices/.classpath	2009-02-27 06:32:23 UTC (rev 84857)
+++ trunk/webservices/.classpath	2009-02-27 06:33:43 UTC (rev 84858)
@@ -9,5 +9,8 @@
 	<classpathentry kind="lib" path="/thirdparty/jboss/jboss-deployers/lib/jboss-deployers-client.jar" sourcepath="/thirdparty/jboss/jboss-deployers/lib/jboss-deployers-client-sources.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/org/jboss/ws/lib/jbossws-spi.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/server"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-kernel.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-kernel-sources.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-dependency.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-dependency-sources.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/jbossxb/lib/jboss-xml-binding.jar"/>
 	<classpathentry kind="output" path="output/eclipse-classes"/>
 </classpath>




More information about the jboss-cvs-commits mailing list