[jboss-cvs] JBossAS SVN: r84895 - in branches/Branch_5_x: aspects and 27 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Feb 27 16:24:19 EST 2009
Author: ALRubinger
Date: 2009-02-27 16:24:18 -0500 (Fri, 27 Feb 2009)
New Revision: 84895
Removed:
branches/Branch_5_x/bootstrap/
Modified:
branches/Branch_5_x/aspects/.classpath
branches/Branch_5_x/build/build-distr.xml
branches/Branch_5_x/build/build.xml
branches/Branch_5_x/cluster/.classpath
branches/Branch_5_x/cluster/build.xml
branches/Branch_5_x/component-matrix/pom.xml
branches/Branch_5_x/connector/.classpath
branches/Branch_5_x/connector/build.xml
branches/Branch_5_x/console/.classpath
branches/Branch_5_x/console/build.xml
branches/Branch_5_x/deployment/.classpath
branches/Branch_5_x/ejb3/.classpath
branches/Branch_5_x/embedded/.classpath
branches/Branch_5_x/hibernate-int/.classpath
branches/Branch_5_x/iiop/.classpath
branches/Branch_5_x/iiop/build.xml
branches/Branch_5_x/main/.classpath
branches/Branch_5_x/main/build.xml
branches/Branch_5_x/main/pom.xml
branches/Branch_5_x/main/src/assembly/run.xml
branches/Branch_5_x/management/.classpath
branches/Branch_5_x/management/build.xml
branches/Branch_5_x/messaging/.classpath
branches/Branch_5_x/pom.xml
branches/Branch_5_x/profileservice/.classpath
branches/Branch_5_x/security/.classpath
branches/Branch_5_x/server/.classpath
branches/Branch_5_x/server/build.xml
branches/Branch_5_x/server/pom.xml
branches/Branch_5_x/server/src/assembly/shutdown.xml
branches/Branch_5_x/spring-int/.classpath
branches/Branch_5_x/system-jmx/.classpath
branches/Branch_5_x/system-jmx/build.xml
branches/Branch_5_x/system-jmx/pom.xml
branches/Branch_5_x/system-jmx/src/main/org/jboss/system/server/jmx/JMXKernel.java
branches/Branch_5_x/system/.classpath
branches/Branch_5_x/system/build.xml
branches/Branch_5_x/system/pom.xml
branches/Branch_5_x/testsuite/.classpath
branches/Branch_5_x/testsuite/build.xml
branches/Branch_5_x/thirdparty/pom.xml
branches/Branch_5_x/tomcat/.classpath
branches/Branch_5_x/tomcat/build.xml
branches/Branch_5_x/varia/.classpath
branches/Branch_5_x/varia/build.xml
branches/Branch_5_x/webservices/.classpath
Log:
[JBAS-6171] Remove "bootstrap" module from AS Branch_5_x, bring in jboss-bootstrap:1.0.0-Alpha-2
Modified: branches/Branch_5_x/aspects/.classpath
===================================================================
--- branches/Branch_5_x/aspects/.classpath 2009-02-27 21:02:33 UTC (rev 84894)
+++ branches/Branch_5_x/aspects/.classpath 2009-02-27 21:24:18 UTC (rev 84895)
@@ -42,7 +42,7 @@
<classpathentry kind="lib" path="/thirdparty/jboss/aop/lib/jboss-aop-asintegration-mc.jar" sourcepath="/thirdparty/jboss/aop/lib/jboss-aop-asintegration-mc-sources.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/aop/lib/jboss-aop-aspects.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/aop/lib/jboss-aop-asintegration-jmx.jar"/>
- <classpathentry combineaccessrules="false" kind="src" path="/bootstrap"/>
<classpathentry kind="lib" path="/thirdparty/jboss/web/lib/servlet-api.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/jboss-bootstrap/lib/jboss-bootstrap.jar"/>
<classpathentry kind="output" path="output/eclipse-classes"/>
</classpath>
Modified: branches/Branch_5_x/build/build-distr.xml
===================================================================
--- branches/Branch_5_x/build/build-distr.xml 2009-02-27 21:02:33 UTC (rev 84894)
+++ branches/Branch_5_x/build/build-distr.xml 2009-02-27 21:24:18 UTC (rev 84895)
@@ -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 -->
<!-- ====== -->
@@ -1970,6 +1942,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: branches/Branch_5_x/build/build.xml
===================================================================
--- branches/Branch_5_x/build/build.xml 2009-02-27 21:02:33 UTC (rev 84894)
+++ branches/Branch_5_x/build/build.xml 2009-02-27 21:24:18 UTC (rev 84895)
@@ -89,7 +89,6 @@
<!-- Modules -->
<module name="aspects"/>
- <module name="bootstrap"/>
<module name="cluster"/>
<module name="connector"/>
<module name="console"/>
@@ -128,7 +127,7 @@
</group>
<group name="core">
- <include modules="bootstrap, main, j2se, mbeans, jmx, system, system-jmx"/>
+ <include modules="main, j2se, mbeans, jmx, system, system-jmx"/>
</group>
<group name="basic">
@@ -446,18 +445,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: branches/Branch_5_x/cluster/.classpath
===================================================================
--- branches/Branch_5_x/cluster/.classpath 2009-02-27 21:02:33 UTC (rev 84894)
+++ branches/Branch_5_x/cluster/.classpath 2009-02-27 21:24:18 UTC (rev 84895)
@@ -9,9 +9,10 @@
<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/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="output" path="output/eclipse-classes"/>
</classpath>
Modified: branches/Branch_5_x/cluster/build.xml
===================================================================
--- branches/Branch_5_x/cluster/build.xml 2009-02-27 21:02:33 UTC (rev 84894)
+++ branches/Branch_5_x/cluster/build.xml 2009-02-27 21:24:18 UTC (rev 84895)
@@ -102,7 +102,7 @@
&modules;
<!-- The combined dependent module classpath -->
<path id="dependentmodule.classpath">
- <path refid="jboss.bootstrap.classpath"/>
+ <path refid="jboss.jboss.bootstrap.classpath"/>
<path refid="jboss.profileservice.spi.classpath"/>
<path refid="jboss.system.classpath"/>
<path refid="jboss.systemjmx.classpath"/>
Modified: branches/Branch_5_x/component-matrix/pom.xml
===================================================================
--- branches/Branch_5_x/component-matrix/pom.xml 2009-02-27 21:02:33 UTC (rev 84894)
+++ branches/Branch_5_x/component-matrix/pom.xml 2009-02-27 21:24:18 UTC (rev 84895)
@@ -50,6 +50,7 @@
<version.org.jboss.aspects.currentinvocation>1.0.0.GA</version.org.jboss.aspects.currentinvocation>
<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.bootstrap>1.0.0-Alpha-2</version.org.jboss.bootstrap>
<version.org.jboss.aspects.transaction>1.0.0.GA</version.org.jboss.aspects.transaction>
<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>
@@ -133,6 +134,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>
@@ -581,6 +583,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.logging</groupId>
Modified: branches/Branch_5_x/connector/.classpath
===================================================================
--- branches/Branch_5_x/connector/.classpath 2009-02-27 21:02:33 UTC (rev 84894)
+++ branches/Branch_5_x/connector/.classpath 2009-02-27 21:24:18 UTC (rev 84895)
@@ -16,5 +16,9 @@
<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/microcontainer/lib/jboss-kernel.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-kernel-sources.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/jboss-bootstrap/lib/jboss-bootstrap.jar"/>
<classpathentry kind="output" path="output/eclipse-classes"/>
</classpath>
Modified: branches/Branch_5_x/connector/build.xml
===================================================================
--- branches/Branch_5_x/connector/build.xml 2009-02-27 21:02:33 UTC (rev 84894)
+++ branches/Branch_5_x/connector/build.xml 2009-02-27 21:24:18 UTC (rev 84895)
@@ -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.j2se.classpath"/>
Modified: branches/Branch_5_x/console/.classpath
===================================================================
--- branches/Branch_5_x/console/.classpath 2009-02-27 21:02:33 UTC (rev 84894)
+++ branches/Branch_5_x/console/.classpath 2009-02-27 21:24:18 UTC (rev 84895)
@@ -10,5 +10,7 @@
<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/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="output" path="output/eclipse-classes"/>
</classpath>
Modified: branches/Branch_5_x/console/build.xml
===================================================================
--- branches/Branch_5_x/console/build.xml 2009-02-27 21:02:33 UTC (rev 84894)
+++ branches/Branch_5_x/console/build.xml 2009-02-27 21:24:18 UTC (rev 84895)
@@ -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: branches/Branch_5_x/deployment/.classpath
===================================================================
--- branches/Branch_5_x/deployment/.classpath 2009-02-27 21:02:33 UTC (rev 84894)
+++ branches/Branch_5_x/deployment/.classpath 2009-02-27 21:24:18 UTC (rev 84895)
@@ -5,5 +5,7 @@
<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/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: branches/Branch_5_x/ejb3/.classpath
===================================================================
--- branches/Branch_5_x/ejb3/.classpath 2009-02-27 21:02:33 UTC (rev 84894)
+++ branches/Branch_5_x/ejb3/.classpath 2009-02-27 21:24:18 UTC (rev 84895)
@@ -24,5 +24,9 @@
<classpathentry kind="lib" path="/thirdparty/jboss/jboss-ejb3-common/lib/jboss-ejb3-common.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/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-kernel.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-kernel-sources.jar"/>
<classpathentry kind="output" path="output/eclipse-classes"/>
</classpath>
Modified: branches/Branch_5_x/embedded/.classpath
===================================================================
--- branches/Branch_5_x/embedded/.classpath 2009-02-27 21:02:33 UTC (rev 84894)
+++ branches/Branch_5_x/embedded/.classpath 2009-02-27 21:24:18 UTC (rev 84895)
@@ -37,11 +37,8 @@
<classpathentry kind="lib" path="/thirdparty/jboss/test/lib/jboss-test.jar"/>
<classpathentry kind="lib" path="/thirdparty/junit/lib/junit.jar"/>
<classpathentry kind="lib" path="/thirdparty/hsqldb/lib/hsqldb.jar"/>
- <classpathentry kind="lib" path="/thirdparty/jboss/jbossts/lib/jbossjta.jar"/>
<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"/>
Modified: branches/Branch_5_x/hibernate-int/.classpath
===================================================================
--- branches/Branch_5_x/hibernate-int/.classpath 2009-02-27 21:02:33 UTC (rev 84894)
+++ branches/Branch_5_x/hibernate-int/.classpath 2009-02-27 21:24:18 UTC (rev 84895)
@@ -7,5 +7,8 @@
<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/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/microcontainer/lib/jboss-dependency.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-dependency-sources.jar"/>
<classpathentry kind="output" path="output/eclipse-classes"/>
</classpath>
Modified: branches/Branch_5_x/iiop/.classpath
===================================================================
--- branches/Branch_5_x/iiop/.classpath 2009-02-27 21:02:33 UTC (rev 84894)
+++ branches/Branch_5_x/iiop/.classpath 2009-02-27 21:24:18 UTC (rev 84895)
@@ -6,5 +6,7 @@
<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/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="output" path="output/eclipse-classes"/>
</classpath>
Modified: branches/Branch_5_x/iiop/build.xml
===================================================================
--- branches/Branch_5_x/iiop/build.xml 2009-02-27 21:02:33 UTC (rev 84894)
+++ branches/Branch_5_x/iiop/build.xml 2009-02-27 21:24:18 UTC (rev 84895)
@@ -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: branches/Branch_5_x/main/.classpath
===================================================================
--- branches/Branch_5_x/main/.classpath 2009-02-27 21:02:33 UTC (rev 84894)
+++ branches/Branch_5_x/main/.classpath 2009-02-27 21:24:18 UTC (rev 84895)
@@ -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: branches/Branch_5_x/main/build.xml
===================================================================
--- branches/Branch_5_x/main/build.xml 2009-02-27 21:02:33 UTC (rev 84894)
+++ branches/Branch_5_x/main/build.xml 2009-02-27 21:24:18 UTC (rev 84895)
@@ -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: branches/Branch_5_x/main/pom.xml
===================================================================
--- branches/Branch_5_x/main/pom.xml 2009-02-27 21:02:33 UTC (rev 84894)
+++ branches/Branch_5_x/main/pom.xml 2009-02-27 21:24:18 UTC (rev 84895)
@@ -54,8 +54,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: branches/Branch_5_x/main/src/assembly/run.xml
===================================================================
--- branches/Branch_5_x/main/src/assembly/run.xml 2009-02-27 21:02:33 UTC (rev 84894)
+++ branches/Branch_5_x/main/src/assembly/run.xml 2009-02-27 21:24:18 UTC (rev 84895)
@@ -31,10 +31,11 @@
<include>org/jboss/bootstrap/spi/Server.class</include>
<include>org/jboss/bootstrap/spi/ServerConfig.class</include>
<include>org/jboss/bootstrap/spi/util/ServerConfigUtil.class</include>
+ <include>org/jboss/bootstrap/microcontainer/ServerImpl.class</include>
</includes>
</unpackOptions>
<includes>
- <include>org.jboss.jbossas:jboss-as-bootstrap</include>
+ <include>org.jboss.bootstrap:jboss-bootstrap</include>
</includes>
</dependencySet>
<dependencySet>
@@ -44,4 +45,4 @@
</includes>
</dependencySet>
</dependencySets>
-</assembly>
\ No newline at end of file
+</assembly>
Modified: branches/Branch_5_x/management/.classpath
===================================================================
--- branches/Branch_5_x/management/.classpath 2009-02-27 21:02:33 UTC (rev 84894)
+++ branches/Branch_5_x/management/.classpath 2009-02-27 21:24:18 UTC (rev 84895)
@@ -4,5 +4,7 @@
<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/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="output" path="output/eclipse-classes"/>
</classpath>
Modified: branches/Branch_5_x/management/build.xml
===================================================================
--- branches/Branch_5_x/management/build.xml 2009-02-27 21:02:33 UTC (rev 84894)
+++ branches/Branch_5_x/management/build.xml 2009-02-27 21:24:18 UTC (rev 84895)
@@ -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.j2se.classpath"/>
Modified: branches/Branch_5_x/messaging/.classpath
===================================================================
--- branches/Branch_5_x/messaging/.classpath 2009-02-27 21:02:33 UTC (rev 84894)
+++ branches/Branch_5_x/messaging/.classpath 2009-02-27 21:24:18 UTC (rev 84895)
@@ -5,5 +5,6 @@
<classpathentry exported="true" kind="src" path="/server"/>
<classpathentry kind="src" path="/j2se"/>
<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/jboss-mdr/lib/jboss-mdr.jar" sourcepath="/thirdparty/jboss/jboss-mdr/lib/jboss-mdr-sources.jar"/>
<classpathentry kind="output" path="output/eclipse-classes"/>
</classpath>
Modified: branches/Branch_5_x/pom.xml
===================================================================
--- branches/Branch_5_x/pom.xml 2009-02-27 21:02:33 UTC (rev 84894)
+++ branches/Branch_5_x/pom.xml 2009-02-27 21:24:18 UTC (rev 84895)
@@ -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>
@@ -382,7 +377,6 @@
</activation>
<modules>
<module>component-matrix</module>
- <module>bootstrap</module>
<module>main</module>
<module>j2se</module>
<module>mbeans</module>
Modified: branches/Branch_5_x/profileservice/.classpath
===================================================================
--- branches/Branch_5_x/profileservice/.classpath 2009-02-27 21:02:33 UTC (rev 84894)
+++ branches/Branch_5_x/profileservice/.classpath 2009-02-27 21:24:18 UTC (rev 84895)
@@ -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: branches/Branch_5_x/security/.classpath
===================================================================
--- branches/Branch_5_x/security/.classpath 2009-02-27 21:02:33 UTC (rev 84894)
+++ branches/Branch_5_x/security/.classpath 2009-02-27 21:24:18 UTC (rev 84895)
@@ -10,5 +10,7 @@
<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/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="output" path="output/eclipse-classes"/>
</classpath>
Modified: branches/Branch_5_x/server/.classpath
===================================================================
--- branches/Branch_5_x/server/.classpath 2009-02-27 21:02:33 UTC (rev 84894)
+++ branches/Branch_5_x/server/.classpath 2009-02-27 21:24:18 UTC (rev 84895)
@@ -19,5 +19,8 @@
<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/serialization/lib/jboss-serialization.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/web/lib/servlet-api.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="output" path="output/eclipse-classes"/>
</classpath>
Modified: branches/Branch_5_x/server/build.xml
===================================================================
--- branches/Branch_5_x/server/build.xml 2009-02-27 21:02:33 UTC (rev 84894)
+++ branches/Branch_5_x/server/build.xml 2009-02-27 21:24:18 UTC (rev 84895)
@@ -114,7 +114,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.system.classpath"/>
<path refid="jboss.systemjmx.classpath"/>
<path refid="jboss.j2se.classpath"/>
@@ -507,7 +507,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: branches/Branch_5_x/server/pom.xml
===================================================================
--- branches/Branch_5_x/server/pom.xml 2009-02-27 21:02:33 UTC (rev 84894)
+++ branches/Branch_5_x/server/pom.xml 2009-02-27 21:24:18 UTC (rev 84895)
@@ -176,8 +176,8 @@
</dependency>
<dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-bootstrap</artifactId>
+ <groupId>org.jboss.bootstrap</groupId>
+ <artifactId>jboss-bootstrap</artifactId>
</dependency>
<dependency>
@@ -333,4 +333,4 @@
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified: branches/Branch_5_x/server/src/assembly/shutdown.xml
===================================================================
--- branches/Branch_5_x/server/src/assembly/shutdown.xml 2009-02-27 21:02:33 UTC (rev 84894)
+++ branches/Branch_5_x/server/src/assembly/shutdown.xml 2009-02-27 21:24:18 UTC (rev 84895)
@@ -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: branches/Branch_5_x/spring-int/.classpath
===================================================================
--- branches/Branch_5_x/spring-int/.classpath 2009-02-27 21:02:33 UTC (rev 84894)
+++ branches/Branch_5_x/spring-int/.classpath 2009-02-27 21:24:18 UTC (rev 84895)
@@ -16,5 +16,7 @@
<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/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: branches/Branch_5_x/system/.classpath
===================================================================
--- branches/Branch_5_x/system/.classpath 2009-02-27 21:02:33 UTC (rev 84894)
+++ branches/Branch_5_x/system/.classpath 2009-02-27 21:24:18 UTC (rev 84895)
@@ -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"/>
@@ -29,5 +28,13 @@
<classpathentry combineaccessrules="false" kind="src" path="/main"/>
<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/profileservice-spi/lib/jboss-profileservice-spi.jar" sourcepath="/thirdparty/jboss/profileservice-spi/lib/jboss-profileservice-spi-sources.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/jboss-bootstrap/lib/jboss-bootstrap.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-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: branches/Branch_5_x/system/build.xml
===================================================================
--- branches/Branch_5_x/system/build.xml 2009-02-27 21:02:33 UTC (rev 84894)
+++ branches/Branch_5_x/system/build.xml 2009-02-27 21:24:18 UTC (rev 84895)
@@ -95,7 +95,7 @@
<!-- The combined dependant module classpath -->
<path id="dependentmodule.classpath">
<path refid="jboss.main.classpath"/>
- <path refid="jboss.bootstrap.classpath"/>
+ <path refid="jboss.jboss.bootstrap.classpath"/>
</path>
<!-- ===== -->
Modified: branches/Branch_5_x/system/pom.xml
===================================================================
--- branches/Branch_5_x/system/pom.xml 2009-02-27 21:02:33 UTC (rev 84894)
+++ branches/Branch_5_x/system/pom.xml 2009-02-27 21:24:18 UTC (rev 84895)
@@ -112,8 +112,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: branches/Branch_5_x/system-jmx/.classpath
===================================================================
--- branches/Branch_5_x/system-jmx/.classpath 2009-02-27 21:02:33 UTC (rev 84894)
+++ branches/Branch_5_x/system-jmx/.classpath 2009-02-27 21:24:18 UTC (rev 84895)
@@ -21,5 +21,9 @@
<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/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/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="output" path="output/eclipse-classes"/>
</classpath>
Modified: branches/Branch_5_x/system-jmx/build.xml
===================================================================
--- branches/Branch_5_x/system-jmx/build.xml 2009-02-27 21:02:33 UTC (rev 84894)
+++ branches/Branch_5_x/system-jmx/build.xml 2009-02-27 21:24:18 UTC (rev 84895)
@@ -100,7 +100,7 @@
<path id="dependentmodule.classpath">
<path refid="jboss.j2se.classpath"/>
<path refid="jboss.mbeans.classpath"/>
- <path refid="jboss.bootstrap.classpath"/>
+ <path refid="jboss.jboss.bootstrap.classpath"/>
<path refid="jboss.system.classpath"/>
</path>
Modified: branches/Branch_5_x/system-jmx/pom.xml
===================================================================
--- branches/Branch_5_x/system-jmx/pom.xml 2009-02-27 21:02:33 UTC (rev 84894)
+++ branches/Branch_5_x/system-jmx/pom.xml 2009-02-27 21:24:18 UTC (rev 84895)
@@ -86,8 +86,8 @@
<artifactId>jboss-as-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: branches/Branch_5_x/system-jmx/src/main/org/jboss/system/server/jmx/JMXKernel.java
===================================================================
--- branches/Branch_5_x/system-jmx/src/main/org/jboss/system/server/jmx/JMXKernel.java 2009-02-27 21:02:33 UTC (rev 84894)
+++ branches/Branch_5_x/system-jmx/src/main/org/jboss/system/server/jmx/JMXKernel.java 2009-02-27 21:24:18 UTC (rev 84895)
@@ -25,9 +25,11 @@
import java.lang.reflect.Method;
import java.net.URL;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.Date;
import java.util.List;
import java.util.Properties;
+import java.util.Map;
import javax.management.ListenerNotFoundException;
import javax.management.MBeanNotificationInfo;
@@ -112,10 +114,37 @@
return mbeanServer;
}
+ /**
+ * Get the optional server configuration metadata
+ * @return a possibly empty map of configuration metadata.
+ */
+ @SuppressWarnings("unchecked")
+ public Map<String, Object> getMetaData()
+ {
+ return Collections.emptyMap();
+ }
+
+
public ServerInfoMBean getServerInfo()
{
return serverInfo;
}
+
+ /**
+ * Initialize the Server instance.
+ *
+ * @param props The configuration properties for the server.
+ * @param metadata configuration metadata for the server
+ *
+ * @throws IllegalStateException Already initialized.
+ * @throws Exception Failed to initialize.
+ */
+ public void init(Properties props, Map<String, Object> metaData) throws IllegalStateException, Exception
+ {
+ return; //NOOP for now
+ }
+
+
public void setServerInfo(ServerInfoMBean serverInfo)
{
this.serverInfo = serverInfo;
Modified: branches/Branch_5_x/testsuite/.classpath
===================================================================
--- branches/Branch_5_x/testsuite/.classpath 2009-02-27 21:02:33 UTC (rev 84894)
+++ branches/Branch_5_x/testsuite/.classpath 2009-02-27 21:24:18 UTC (rev 84895)
@@ -50,5 +50,8 @@
<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/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="output" path="output/eclipse-classes"/>
</classpath>
Modified: branches/Branch_5_x/testsuite/build.xml
===================================================================
--- branches/Branch_5_x/testsuite/build.xml 2009-02-27 21:02:33 UTC (rev 84894)
+++ branches/Branch_5_x/testsuite/build.xml 2009-02-27 21:24:18 UTC (rev 84895)
@@ -238,7 +238,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: branches/Branch_5_x/thirdparty/pom.xml
===================================================================
--- branches/Branch_5_x/thirdparty/pom.xml 2009-02-27 21:02:33 UTC (rev 84894)
+++ branches/Branch_5_x/thirdparty/pom.xml 2009-02-27 21:24:18 UTC (rev 84895)
@@ -292,6 +292,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.cache</groupId>
<artifactId>jbosscache-core</artifactId>
<mapping>
@@ -1322,6 +1329,10 @@
<groupId>org.jboss.aspects</groupId>
<artifactId>jboss-security-aspects</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.jboss.bootstrap</groupId>
+ <artifactId>jboss-bootstrap</artifactId>
+ </dependency>
<!-- Combined integration jar. Maybe this can be removed when we just use the
- individual compoennts -->
Modified: branches/Branch_5_x/tomcat/.classpath
===================================================================
--- branches/Branch_5_x/tomcat/.classpath 2009-02-27 21:02:33 UTC (rev 84894)
+++ branches/Branch_5_x/tomcat/.classpath 2009-02-27 21:24:18 UTC (rev 84895)
@@ -27,5 +27,8 @@
<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/jboss-bootstrap/lib/jboss-bootstrap.jar"/>
<classpathentry kind="output" path="output/eclipse-classes"/>
</classpath>
Modified: branches/Branch_5_x/tomcat/build.xml
===================================================================
--- branches/Branch_5_x/tomcat/build.xml 2009-02-27 21:02:33 UTC (rev 84894)
+++ branches/Branch_5_x/tomcat/build.xml 2009-02-27 21:24:18 UTC (rev 84895)
@@ -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: branches/Branch_5_x/varia/.classpath
===================================================================
--- branches/Branch_5_x/varia/.classpath 2009-02-27 21:02:33 UTC (rev 84894)
+++ branches/Branch_5_x/varia/.classpath 2009-02-27 21:24:18 UTC (rev 84895)
@@ -22,5 +22,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/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/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="output" path="output/eclipse-classes"/>
</classpath>
Modified: branches/Branch_5_x/varia/build.xml
===================================================================
--- branches/Branch_5_x/varia/build.xml 2009-02-27 21:02:33 UTC (rev 84894)
+++ branches/Branch_5_x/varia/build.xml 2009-02-27 21:24:18 UTC (rev 84895)
@@ -117,7 +117,7 @@
<path refid="jboss.common.logging.jdk.classpath"/>
<path refid="jboss.jmx.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.j2se.classpath"/>
Modified: branches/Branch_5_x/webservices/.classpath
===================================================================
--- branches/Branch_5_x/webservices/.classpath 2009-02-27 21:02:33 UTC (rev 84894)
+++ branches/Branch_5_x/webservices/.classpath 2009-02-27 21:24:18 UTC (rev 84895)
@@ -9,5 +9,7 @@
<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="output" path="output/eclipse-classes"/>
</classpath>
More information about the jboss-cvs-commits
mailing list