[jboss-cvs] JBossAS SVN: r93783 - in branches/Branch_5_x: cluster and 43 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sat Sep 19 01:49:09 EDT 2009
Author: ALRubinger
Date: 2009-09-19 01:49:08 -0400 (Sat, 19 Sep 2009)
New Revision: 93783
Modified:
branches/Branch_5_x/build/build-distr.xml
branches/Branch_5_x/cluster/.classpath
branches/Branch_5_x/cluster/build.xml
branches/Branch_5_x/cluster/src/main/org/jboss/ha/framework/server/FarmMemberService.java
branches/Branch_5_x/component-matrix/pom.xml
branches/Branch_5_x/console/.classpath
branches/Branch_5_x/console/build.xml
branches/Branch_5_x/console/src/main/org/jboss/console/manager/DeploymentFileRepository.java
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/main/org/jboss/Main.java
branches/Branch_5_x/server/.classpath
branches/Branch_5_x/server/build.xml
branches/Branch_5_x/server/src/etc/conf/all/bootstrap/profile.xml
branches/Branch_5_x/server/src/etc/conf/all/xmdesc/NamingProviderURLWriter-xmbean.xml
branches/Branch_5_x/server/src/main/org/jboss/Shutdown.java
branches/Branch_5_x/server/src/main/org/jboss/config/ServerConfigUtil.java
branches/Branch_5_x/server/src/main/org/jboss/deployment/JBossEjbParsingDeployer.java
branches/Branch_5_x/server/src/main/org/jboss/invocation/http/server/HttpInvoker.java
branches/Branch_5_x/server/src/main/org/jboss/naming/NamingProviderURLWriter.java
branches/Branch_5_x/server/src/main/org/jboss/web/WebService.java
branches/Branch_5_x/server/src/main/org/jboss/web/deployers/AbstractWarDeployment.java
branches/Branch_5_x/system-jmx/.classpath
branches/Branch_5_x/system-jmx/build.xml
branches/Branch_5_x/system-jmx/src/main/org/jboss/deployment/DeploymentInfo.java
branches/Branch_5_x/system-jmx/src/main/org/jboss/deployment/MainDeployer.java
branches/Branch_5_x/system-jmx/src/main/org/jboss/deployment/MainDeployerMBean.java
branches/Branch_5_x/system-jmx/src/main/org/jboss/deployment/SARDeployer.java
branches/Branch_5_x/system-jmx/src/main/org/jboss/deployment/SerializableDeploymentInfo.java
branches/Branch_5_x/system-jmx/src/main/org/jboss/deployment/SubDeployerSupport.java
branches/Branch_5_x/system-jmx/src/main/org/jboss/deployment/XSLSubDeployer.java
branches/Branch_5_x/system-jmx/src/main/org/jboss/deployment/scanner/AlphaNumericDeploymentSorter.java
branches/Branch_5_x/system-jmx/src/main/org/jboss/deployment/scanner/DeploymentFilter.java
branches/Branch_5_x/system-jmx/src/main/org/jboss/deployment/scanner/PrefixDeploymentSorter.java
branches/Branch_5_x/system-jmx/src/main/org/jboss/deployment/scanner/URLDeploymentScanner.java
branches/Branch_5_x/system-jmx/src/main/org/jboss/system/ServiceContext.java
branches/Branch_5_x/system-jmx/src/main/org/jboss/system/ServiceController.java
branches/Branch_5_x/system-jmx/src/main/org/jboss/system/ServiceDynamicMBeanSupport.java
branches/Branch_5_x/system-jmx/src/main/org/jboss/system/deployers/SARDeployer.java
branches/Branch_5_x/system-jmx/src/main/org/jboss/system/microcontainer/ConfigureAction.java
branches/Branch_5_x/system-jmx/src/main/org/jboss/system/microcontainer/ServiceControllerContext.java
branches/Branch_5_x/system-jmx/src/main/org/jboss/system/microcontainer/ServiceProxy.java
branches/Branch_5_x/system-jmx/src/main/org/jboss/system/microcontainer/jmx/ServiceControllerRegistrationLifecycleCallback.java
branches/Branch_5_x/system-jmx/src/main/org/jboss/system/pm/NullAttributePersistenceManager.java
branches/Branch_5_x/system-jmx/src/main/org/jboss/system/server/ServerConfigImpl.java
branches/Branch_5_x/system-jmx/src/main/org/jboss/system/server/ServerConfigImplMBean.java
branches/Branch_5_x/system-jmx/src/main/org/jboss/system/server/ServerConfigLocator.java
branches/Branch_5_x/system-jmx/src/main/org/jboss/system/server/ServerImplMBean.java
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/JMXKernelMBean.java
branches/Branch_5_x/system-jmx/src/main/org/jboss/system/server/jmx/LazyMBeanServer.java
branches/Branch_5_x/system-jmx/src/main/org/jboss/system/server/jmx/MBeanServerBuilderImpl.java
branches/Branch_5_x/system/.classpath
branches/Branch_5_x/system/build.xml
branches/Branch_5_x/system/src/main/org/jboss/system/server/profileservice/ProfileServiceBootstrap.java
branches/Branch_5_x/system/src/main/org/jboss/system/server/profileservice/repository/clustered/local/JAXBRepositoryContentMetadataPersister.java
branches/Branch_5_x/system/src/main/org/jboss/system/tools/DeploymentScanner.java
branches/Branch_5_x/system/src/tests/org/jboss/test/server/profileservice/MainWithSimpleHotDeployTestCase.java
branches/Branch_5_x/system/src/tests/org/jboss/test/server/profileservice/support/MockServer.java
branches/Branch_5_x/system/src/tests/org/jboss/test/server/profileservice/support/MockServerConfig.java
branches/Branch_5_x/system/src/tests/org/jboss/test/server/profileservice/test/AbstractProfileServiceTestBase.java
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/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatService.java
branches/Branch_5_x/varia/.classpath
branches/Branch_5_x/varia/build.xml
branches/Branch_5_x/varia/src/main/org/jboss/jmx/adaptor/snmp/agent/SnmpAgentService.java
branches/Branch_5_x/varia/src/main/org/jboss/jmx/adaptor/snmp/agent/TrapEmitter.java
branches/Branch_5_x/varia/src/main/org/jboss/jmx/adaptor/snmp/trapd/TrapdService.java
branches/Branch_5_x/varia/src/main/org/jboss/services/binding/impl/Util.java
branches/Branch_5_x/varia/src/main/org/jboss/services/deployment/LibraryManager.java
branches/Branch_5_x/varia/src/main/org/jboss/varia/deployment/FoeDeployer.java
Log:
[JBAS-7278] Put new jboss-bootstrap Alphas and API components into Branch_5_x
Modified: branches/Branch_5_x/build/build-distr.xml
===================================================================
--- branches/Branch_5_x/build/build-distr.xml 2009-09-19 05:35:49 UTC (rev 93782)
+++ branches/Branch_5_x/build/build-distr.xml 2009-09-19 05:49:08 UTC (rev 93783)
@@ -1957,6 +1957,12 @@
excludes="*-sources.jar, *-javadoc.jar" />
<fileset dir="${jboss.jboss.bootstrap.spi.mc.lib}" includes="*.jar"
excludes="*-sources.jar, *-javadoc.jar" />
+ <fileset dir="${jboss.jboss.bootstrap.api.lib}" includes="*.jar"
+ excludes="*-sources.jar, *-javadoc.jar" />
+ <fileset dir="${jboss.jboss.bootstrap.api.as.lib}" includes="*.jar"
+ excludes="*-sources.jar, *-javadoc.jar" />
+ <fileset dir="${jboss.jboss.bootstrap.api.mc.lib}" includes="*.jar"
+ excludes="*-sources.jar, *-javadoc.jar" />
<fileset dir="${jboss.jboss.bootstrap.impl.base.lib}" includes="*.jar"
excludes="*-sources.jar, *-javadoc.jar" />
<fileset dir="${jboss.jboss.bootstrap.impl.as.lib}" includes="*.jar"
Modified: branches/Branch_5_x/cluster/.classpath
===================================================================
--- branches/Branch_5_x/cluster/.classpath 2009-09-19 05:35:49 UTC (rev 93782)
+++ branches/Branch_5_x/cluster/.classpath 2009-09-19 05:49:08 UTC (rev 93783)
@@ -17,5 +17,7 @@
<classpathentry kind="lib" path="/thirdparty/jboss/jboss-bootstrap-spi/lib/jboss-bootstrap-spi.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/jboss-bootstrap-spi-as/lib/jboss-bootstrap-spi-as.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/jboss-bootstrap-spi-mc/lib/jboss-bootstrap-spi-mc.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/jboss-bootstrap-api/lib/jboss-bootstrap-api.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/jboss-bootstrap-api-as/lib/jboss-bootstrap-api-as.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-09-19 05:35:49 UTC (rev 93782)
+++ branches/Branch_5_x/cluster/build.xml 2009-09-19 05:49:08 UTC (rev 93783)
@@ -106,6 +106,8 @@
<path refid="jboss.jboss.bootstrap.spi.as.classpath"/>
<path refid="jboss.jboss.bootstrap.spi.mc.classpath"/>
<path refid="jboss.jboss.bootstrap.spi.classpath"/>
+ <path refid="jboss.jboss.bootstrap.api.as.classpath"/>
+ <path refid="jboss.jboss.bootstrap.api.classpath"/>
<path refid="jboss.profileservice.spi.classpath"/>
<path refid="jboss.system.classpath"/>
<path refid="jboss.systemjmx.classpath"/>
Modified: branches/Branch_5_x/cluster/src/main/org/jboss/ha/framework/server/FarmMemberService.java
===================================================================
--- branches/Branch_5_x/cluster/src/main/org/jboss/ha/framework/server/FarmMemberService.java 2009-09-19 05:35:49 UTC (rev 93782)
+++ branches/Branch_5_x/cluster/src/main/org/jboss/ha/framework/server/FarmMemberService.java 2009-09-19 05:49:08 UTC (rev 93783)
@@ -30,7 +30,7 @@
import java.util.Iterator;
import java.util.Map;
-import org.jboss.bootstrap.spi.as.config.JBossASServerConfig;
+import org.jboss.bootstrap.api.as.config.JBossASServerConfig;
import org.jboss.deployment.scanner.URLDeploymentScanner;
import org.jboss.ha.framework.interfaces.HAPartition;
import org.jboss.system.server.ServerConfigLocator;
Modified: branches/Branch_5_x/component-matrix/pom.xml
===================================================================
--- branches/Branch_5_x/component-matrix/pom.xml 2009-09-19 05:35:49 UTC (rev 93782)
+++ branches/Branch_5_x/component-matrix/pom.xml 2009-09-19 05:49:08 UTC (rev 93783)
@@ -56,12 +56,15 @@
<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.1</version.org.jboss.aspects.security>
- <version.org.jboss.bootstrap.impl.as>2.0.0-alpha-3</version.org.jboss.bootstrap.impl.as>
- <version.org.jboss.bootstrap.impl.base>2.0.0-alpha-3</version.org.jboss.bootstrap.impl.base>
- <version.org.jboss.bootstrap.impl.mc>2.0.0-alpha-2</version.org.jboss.bootstrap.impl.mc>
- <version.org.jboss.bootstrap.spi>2.0.0-alpha-2</version.org.jboss.bootstrap.spi>
- <version.org.jboss.bootstrap.spi.as>2.0.0-alpha-3</version.org.jboss.bootstrap.spi.as>
- <version.org.jboss.bootstrap.spi.mc>2.0.0-alpha-1</version.org.jboss.bootstrap.spi.mc>
+ <version.org.jboss.bootstrap.api>2.0.0-alpha-1</version.org.jboss.bootstrap.api>
+ <version.org.jboss.bootstrap.api.as>2.0.0-alpha-1</version.org.jboss.bootstrap.api.as>
+ <version.org.jboss.bootstrap.api.mc>2.0.0-alpha-1</version.org.jboss.bootstrap.api.mc>
+ <version.org.jboss.bootstrap.impl.as>2.0.0-alpha-4</version.org.jboss.bootstrap.impl.as>
+ <version.org.jboss.bootstrap.impl.base>2.0.0-alpha-4</version.org.jboss.bootstrap.impl.base>
+ <version.org.jboss.bootstrap.impl.mc>2.0.0-alpha-3</version.org.jboss.bootstrap.impl.mc>
+ <version.org.jboss.bootstrap.spi>2.0.0-alpha-3</version.org.jboss.bootstrap.spi>
+ <version.org.jboss.bootstrap.spi.as>2.0.0-alpha-4</version.org.jboss.bootstrap.spi.as>
+ <version.org.jboss.bootstrap.spi.mc>2.0.0-alpha-2</version.org.jboss.bootstrap.spi.mc>
<version.org.jboss.aspects.transaction>1.0.0.GA</version.org.jboss.aspects.transaction>
<version.org.jboss.cache.core>3.2.0.GA</version.org.jboss.cache.core>
<version.org.jboss.cache.pojo>3.0.0.GA</version.org.jboss.cache.pojo>
@@ -546,6 +549,24 @@
<dependency>
<groupId>org.jboss.bootstrap</groupId>
+ <artifactId>jboss-bootstrap-api</artifactId>
+ <version>${version.org.jboss.bootstrap.api}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.bootstrap</groupId>
+ <artifactId>jboss-bootstrap-api-as</artifactId>
+ <version>${version.org.jboss.bootstrap.api.as}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.bootstrap</groupId>
+ <artifactId>jboss-bootstrap-api-mc</artifactId>
+ <version>${version.org.jboss.bootstrap.api.mc}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.bootstrap</groupId>
<artifactId>jboss-bootstrap-impl-as</artifactId>
<version>${version.org.jboss.bootstrap.impl.as}</version>
</dependency>
Modified: branches/Branch_5_x/console/.classpath
===================================================================
--- branches/Branch_5_x/console/.classpath 2009-09-19 05:35:49 UTC (rev 93782)
+++ branches/Branch_5_x/console/.classpath 2009-09-19 05:49:08 UTC (rev 93783)
@@ -14,5 +14,7 @@
<classpathentry kind="lib" path="/thirdparty/jboss/jboss-bootstrap-spi/lib/jboss-bootstrap-spi.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/jboss-bootstrap-spi-as/lib/jboss-bootstrap-spi-as.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/jboss-bootstrap-spi-mc/lib/jboss-bootstrap-spi-mc.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/jboss-bootstrap-api/lib/jboss-bootstrap-api.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/jboss-bootstrap-api-as/lib/jboss-bootstrap-api-as.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-09-19 05:35:49 UTC (rev 93782)
+++ branches/Branch_5_x/console/build.xml 2009-09-19 05:49:08 UTC (rev 93783)
@@ -102,6 +102,9 @@
<path refid="jboss.jboss.bootstrap.spi.as.classpath"/>
<path refid="jboss.jboss.bootstrap.spi.mc.classpath"/>
<path refid="jboss.jboss.bootstrap.spi.classpath"/>
+ <path refid="jboss.jboss.bootstrap.api.as.classpath"/>
+ <path refid="jboss.jboss.bootstrap.api.mc.classpath"/>
+ <path refid="jboss.jboss.bootstrap.api.classpath"/>
<path refid="jboss.system.classpath"/>
<path refid="jboss.systemjmx.classpath"/>
<path refid="jboss.varia.classpath"/>
Modified: branches/Branch_5_x/console/src/main/org/jboss/console/manager/DeploymentFileRepository.java
===================================================================
--- branches/Branch_5_x/console/src/main/org/jboss/console/manager/DeploymentFileRepository.java 2009-09-19 05:35:49 UTC (rev 93782)
+++ branches/Branch_5_x/console/src/main/org/jboss/console/manager/DeploymentFileRepository.java 2009-09-19 05:49:08 UTC (rev 93783)
@@ -29,7 +29,7 @@
import javax.management.MBeanServer;
import javax.management.ObjectName;
-import org.jboss.bootstrap.spi.as.config.JBossASServerConfig;
+import org.jboss.bootstrap.api.as.config.JBossASServerConfig;
import org.jboss.system.ServiceMBeanSupport;
import org.jboss.system.server.ServerConfigLocator;
Modified: branches/Branch_5_x/main/.classpath
===================================================================
--- branches/Branch_5_x/main/.classpath 2009-09-19 05:35:49 UTC (rev 93782)
+++ branches/Branch_5_x/main/.classpath 2009-09-19 05:49:08 UTC (rev 93783)
@@ -3,8 +3,8 @@
<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 kind="lib" path="/thirdparty/jboss/jboss-bootstrap-spi/lib/jboss-bootstrap-spi.jar"/>
- <classpathentry kind="lib" path="/thirdparty/jboss/jboss-bootstrap-spi-as/lib/jboss-bootstrap-spi-as.jar"/>
- <classpathentry kind="lib" path="/thirdparty/jboss/jboss-bootstrap-spi-mc/lib/jboss-bootstrap-spi-mc.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/jboss-bootstrap-api/lib/jboss-bootstrap-api.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/jboss-bootstrap-api-as/lib/jboss-bootstrap-api-as.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/jboss-bootstrap-spi-as/lib/jboss-bootstrap-spi-as.jar" sourcepath="/thirdparty/jboss/jboss-bootstrap-spi-as/lib/jboss-bootstrap-spi-as-sources.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-09-19 05:35:49 UTC (rev 93782)
+++ branches/Branch_5_x/main/build.xml 2009-09-19 05:49:08 UTC (rev 93783)
@@ -78,10 +78,10 @@
<!-- The combined dependant module classpath -->
<path id="dependentmodule.classpath">
- <path refid="jboss.jboss.bootstrap.impl.as.classpath"/>
+ <path refid="jboss.jboss.bootstrap.api.classpath"/>
+ <path refid="jboss.jboss.bootstrap.api.as.classpath"/>
<path refid="jboss.jboss.bootstrap.spi.classpath"/>
- <path refid="jboss.jboss.bootstrap.spi.as.classpath"/>
- <path refid="jboss.jboss.bootstrap.spi.mc.classpath"/>
+ <path refid="jboss.jboss.bootstrap.spi.as.classpath"/>
</path>
<!-- ===== -->
@@ -147,27 +147,28 @@
</jar>
<!-- Inflate out contents of the Bootstrap JAR into a Temp Directory -->
- <property name="inflated.spi.dir" value="target/tmp-bootstrap-spi" />
- <property name="inflated.spi.as.dir" value="target/tmp-bootstrap-spi-as" />
- <property name="inflated.spi.mc.dir" value="target/tmp-bootstrap-spi-mc" />
- <mkdir dir="${inflated.spi.dir}"/>
- <unjar dest="${inflated.spi.dir}">
- <fileset dir="${jboss.jboss.bootstrap.spi.lib}">
- <include name="jboss-bootstrap-spi.jar"/>
+ <property name="inflated.api.dir" value="target/tmp-bootstrap-api" />
+ <mkdir dir="${inflated.api.dir}"/>
+ <unjar dest="${inflated.api.dir}">
+ <fileset dir="${jboss.jboss.bootstrap.api.lib}">
+ <include name="jboss-bootstrap-api.jar"/>
</fileset>
- </unjar>
- <mkdir dir="${inflated.spi.as.dir}"/>
- <unjar dest="${inflated.spi.as.dir}">
+ <fileset dir="${jboss.jboss.bootstrap.api.as.lib}">
+ <include name="jboss-bootstrap-api-as.jar"/>
+ </fileset>
+ <!-- <fileset dir="${jboss.jboss.bootstrap.api.mc.lib}">
+ <include name="jboss-bootstrap-api-mc.jar"/>
+ </fileset> -->
+ <fileset dir="${jboss.jboss.bootstrap.spi.lib}">
+ <include name="jboss-bootstrap-spi.jar"/>
+ </fileset>
<fileset dir="${jboss.jboss.bootstrap.spi.as.lib}">
<include name="jboss-bootstrap-spi-as.jar"/>
- </fileset>
- </unjar>
- <mkdir dir="${inflated.spi.mc.dir}"/>
- <unjar dest="${inflated.spi.mc.dir}">
- <fileset dir="${jboss.jboss.bootstrap.spi.mc.lib}">
- <include name="jboss-bootstrap-spi-mc.jar"/>
- </fileset>
- </unjar>
+ </fileset>
+ <fileset dir="${jboss.jboss.bootstrap.spi.mc.lib}">
+ <include name="jboss-bootstrap-spi-mc.jar"/>
+ </fileset>
+ </unjar>
<!-- Build run.jar -->
<jar jarfile="${build.lib}/run.jar" manifest="${build.etc}/run.mf">
@@ -179,18 +180,13 @@
<include name="jdklogger.xml"/>
<include name="org/jboss/version.properties"/>
</fileset>
- <!-- Add Bootstrap SPI classes -->
- <fileset dir="${inflated.spi.dir}">
- <include name="org/jboss/bootstrap/spi/**"/>
+ <!-- Add Bootstrap API/SPI classes -->
+ <fileset dir="${inflated.api.dir}">
+ <include name="org/jboss/bootstrap/api/**"/>
+ <include name="org/jboss/bootstrap/spi/as/config/JBossASConfigurationInitializer"/>
+ <include name="org/jboss/bootstrap/spi/as/config/JBossASBasedConfigurationInitializer"/>
+ <include name="org/jboss/bootstrap/spi/config/ConfigurationInitializer"/>
</fileset>
- <fileset dir="${inflated.spi.as.dir}">
- <include name="org/jboss/bootstrap/spi/as/config/JBossASServerConfig.class"/>
- <include name="org/jboss/bootstrap/spi/as/config/JBossASBasedServerConfig.class"/>
- <include name="org/jboss/bootstrap/spi/as/config/JBossASConfigurationInitializer.class"/>
- </fileset>
- <fileset dir="${inflated.spi.mc.dir}">
- <include name="org/jboss/bootstrap/spi/mc/config/MCBasedServerConfig.class"/>
- </fileset>
<!-- Include getopt -->
<zipfileset src="${gnu.getopt.lib}/getopt.jar">
@@ -199,7 +195,7 @@
</jar>
<!-- Remove the inflated contents of Bootstrap -->
- <delete dir="${inflated.dir}" />
+ <delete dir="${inflated.api.dir}" />
</target>
Modified: branches/Branch_5_x/main/pom.xml
===================================================================
--- branches/Branch_5_x/main/pom.xml 2009-09-19 05:35:49 UTC (rev 93782)
+++ branches/Branch_5_x/main/pom.xml 2009-09-19 05:49:08 UTC (rev 93783)
@@ -64,7 +64,7 @@
<!-- Compile (global dependencies) -->
<dependency>
<groupId>org.jboss.bootstrap</groupId>
- <artifactId>jboss-bootstrap-impl-as</artifactId>
+ <artifactId>jboss-bootstrap-spi-as</artifactId>
</dependency>
<dependency>
<groupId>gnu-getopt</groupId>
Modified: branches/Branch_5_x/main/src/main/org/jboss/Main.java
===================================================================
--- branches/Branch_5_x/main/src/main/org/jboss/Main.java 2009-09-19 05:35:49 UTC (rev 93782)
+++ branches/Branch_5_x/main/src/main/org/jboss/Main.java 2009-09-19 05:49:08 UTC (rev 93783)
@@ -42,11 +42,11 @@
import java.util.Properties;
import java.util.Set;
+import org.jboss.bootstrap.api.as.config.JBossASServerConfig;
+import org.jboss.bootstrap.api.as.server.JBossASServer;
+import org.jboss.bootstrap.api.factory.ServerFactory;
+import org.jboss.bootstrap.api.lifecycle.LifecycleState;
import org.jboss.bootstrap.spi.as.config.JBossASConfigurationInitializer;
-import org.jboss.bootstrap.spi.as.config.JBossASServerConfig;
-import org.jboss.bootstrap.spi.factory.ServerFactory;
-import org.jboss.bootstrap.spi.lifecycle.LifecycleState;
-import org.jboss.bootstrap.spi.server.Server;
/**
* Provides a command line interface to start the JBoss server.
@@ -67,6 +67,7 @@
* @author <a href="mailto:adrian.brock at happeningtimes.com">Adrian Brock</a>
* @author <a href="mailto:scott.stark at jboss.org">Scott Stark</a>
* @author <a href="mailto:dimitris at jboss.org">Dimitris Andreadis</a>
+ * @author <a href="mailto:andrew.rubinger at jboss.org">ALR</a>
* @version $Revision$
*/
public class Main
@@ -112,7 +113,8 @@
// Bootstrap
"jboss-bootstrap-spi.jar", "jboss-bootstrap-spi-as.jar", "jboss-bootstrap-spi-mc.jar",
"jboss-bootstrap-impl-base.jar", "jboss-bootstrap-impl-as.jar",
- "jboss-bootstrap-impl-mc.jar",
+ "jboss-bootstrap-impl-mc.jar","jboss-bootstrap-api-as.jar","jboss-bootstrap-api-mc.jar",
+ "jboss-bootstrap-api.jar",
// Microcontainer
"javassist.jar", "jboss-reflect.jar", "jboss-mdr.jar", "jboss-dependency.jar", "jboss-kernel.jar",
"jboss-metatype.jar", "jboss-managed.jar",
@@ -130,16 +132,9 @@
private Map<String, String> props = new HashMap<String, String>();
/**
- * The booted server instance.
- *
- * We don't use JBossASServer directly here, because it has
- * a reference to MC and the Kernel. This would put the bootstrap
- * AS SPI upon the application classpath, with references to
- * classes on child ClassLoaders, leading to NCDFE. So just use
- * the minimal SPI set and load everything via reflection
- * using the URLCLs we create which reference the boot libraries.
+ * The booted server instance.
*/
- private Server<?, ?> server;
+ private JBossASServer server;
/**
* The FQN of the default server implementation class to create
@@ -172,7 +167,7 @@
* Access the booted server.
* @return the Server instance.
*/
- public Server<?, ?> getServer()
+ public JBossASServer getServer()
{
return server;
}
@@ -361,7 +356,7 @@
final ClassLoader loadingCl = new URLClassLoader(urlArray, tccl);
// Load the server
- server = ServerFactory.createServer(DEFAULT_AS_SERVER_IMPL_CLASS_NAME, loadingCl);
+ server = (JBossASServer)ServerFactory.createServer(DEFAULT_AS_SERVER_IMPL_CLASS_NAME, loadingCl);
// Get out the default configuration
// This cast to object first is to workaround the JDK Bug: http://bugs.sun.com/view_bug.do?bug_id=6548436
@@ -762,38 +757,6 @@
private static class ServerConfigUtil
{
/**
- * Retrieve the default bind address for the server
- *
- * @return the default bind adress
- */
- public static String getDefaultBindAddress()
- {
- return System.getProperty(JBossASServerConfig.PROP_KEY_JBOSSAS_BIND_ADDRESS);
- }
-
- /**
- * Fix the remote inet address.
- *
- * If we pass the address to the client we don't want to
- * tell it to connect to 0.0.0.0, use our host name instead
- * @param address the passed address
- * @return the fixed address
- */
- public static InetAddress fixRemoteAddress(InetAddress address)
- {
- try
- {
- if (address == null
- || InetAddress.getByName(JBossASConfigurationInitializer.VALUE_BIND_ADDRESS_ANY).equals(address))
- return InetAddress.getLocalHost();
- }
- catch (UnknownHostException ignored)
- {
- }
- return address;
- }
-
- /**
* Fix the remote address.
*
* If we pass the address to the client we don't want to
@@ -813,17 +776,6 @@
}
return address;
}
-
- /**
- * Get the default partition name
- *
- * @return the default partition name
- */
- public static String getDefaultPartitionName()
- {
- return System.getProperty(JBossASServerConfig.PROP_KEY_JBOSSAS_PARTITION_NAME,
- JBossASConfigurationInitializer.VALUE_PARTITION_NAME_DEFAULT);
- }
/**
* Checks if the given system property is set; if so ensures it's value has
@@ -868,7 +820,7 @@
/**
* Underlying server instance
*/
- private Server<?, ?> server;
+ private JBossASServer server;
/**
* ClassLoader used to start/init the server
@@ -882,7 +834,7 @@
* @param serverCl The ClassLoader to be optionally closed upon shutdown
* @throws IllegalArgumentException If any argument is not supplied (null)
*/
- ShutdownHook(final Server<?, ?> server, final ClassLoader serverCl) throws IllegalArgumentException
+ ShutdownHook(final JBossASServer server, final ClassLoader serverCl) throws IllegalArgumentException
{
// Precondition checks
if (server == null)
Modified: branches/Branch_5_x/server/.classpath
===================================================================
--- branches/Branch_5_x/server/.classpath 2009-09-19 05:35:49 UTC (rev 93782)
+++ branches/Branch_5_x/server/.classpath 2009-09-19 05:49:08 UTC (rev 93783)
@@ -23,9 +23,13 @@
<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-spi/lib/jboss-bootstrap-spi.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/jboss-bootstrap-spi-as/lib/jboss-bootstrap-spi-as.jar"/>
- <classpathentry kind="lib" path="/thirdparty/jboss/jboss-bootstrap-spi-mc/lib/jboss-bootstrap-spi-mc.jar"/><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/jboss/jboss-bootstrap-spi-mc/lib/jboss-bootstrap-spi-mc.jar"/>
+ <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/jboss/jboss-man/lib/jboss-metatype.jar" sourcepath="/thirdparty/jboss/jboss-man/lib/jboss-metatype-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/jbossts/lib/jbossjts-integration.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/jboss-bootstrap-api/lib/jboss-bootstrap-api.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/jboss-bootstrap-api-as/lib/jboss-bootstrap-api-as.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/system"/>
<classpathentry kind="output" path="output/eclipse-classes"/>
</classpath>
Modified: branches/Branch_5_x/server/build.xml
===================================================================
--- branches/Branch_5_x/server/build.xml 2009-09-19 05:35:49 UTC (rev 93782)
+++ branches/Branch_5_x/server/build.xml 2009-09-19 05:49:08 UTC (rev 93783)
@@ -118,6 +118,9 @@
<path refid="jboss.jboss.bootstrap.spi.as.classpath"/>
<path refid="jboss.jboss.bootstrap.spi.mc.classpath"/>
<path refid="jboss.jboss.bootstrap.spi.classpath"/>
+ <path refid="jboss.jboss.bootstrap.api.as.classpath"/>
+ <path refid="jboss.jboss.bootstrap.api.mc.classpath"/>
+ <path refid="jboss.jboss.bootstrap.api.classpath"/>
<path refid="jboss.system.classpath"/>
<path refid="jboss.systemjmx.classpath"/>
<path refid="jboss.j2se.classpath"/>
@@ -513,6 +516,9 @@
<fileset dir="${jboss.jboss.bootstrap.spi.lib}">
<include name="jboss-bootstrap-spi.jar"/>
</fileset>
+ <fileset dir="${jboss.jboss.bootstrap.api.lib}">
+ <include name="jboss-bootstrap-api.jar"/>
+ </fileset>
</unjar>
<!-- Build shutdown.jar -->
@@ -526,7 +532,7 @@
</fileset>
<!-- Add some classes from Bootstrap -->
<fileset dir="${inflated.dir}">
- <include name="org/jboss/bootstrap/spi/**/*.class"/>
+ <include name="org/jboss/bootstrap/**/*.class"/>
</fileset>
<!-- Include getopt -->
Modified: branches/Branch_5_x/server/src/etc/conf/all/bootstrap/profile.xml
===================================================================
--- branches/Branch_5_x/server/src/etc/conf/all/bootstrap/profile.xml 2009-09-19 05:35:49 UTC (rev 93782)
+++ branches/Branch_5_x/server/src/etc/conf/all/bootstrap/profile.xml 2009-09-19 05:49:08 UTC (rev 93783)
@@ -170,7 +170,7 @@
<!-- Here we use the constructor version that takes the Server impl and
uses it to find the data dir. You could alternatively use a version
that takes a URI or a File. -->
- <parameter class="org.jboss.bootstrap.spi.as.server.JBossASBasedServer"><inject bean="JBossServer"/></parameter>
+ <parameter class="org.jboss.bootstrap.api.as.server.JBossASBasedServer"><inject bean="JBossServer"/></parameter>
</constructor>
</bean>
Modified: branches/Branch_5_x/server/src/etc/conf/all/xmdesc/NamingProviderURLWriter-xmbean.xml
===================================================================
--- branches/Branch_5_x/server/src/etc/conf/all/xmdesc/NamingProviderURLWriter-xmbean.xml 2009-09-19 05:35:49 UTC (rev 93782)
+++ branches/Branch_5_x/server/src/etc/conf/all/xmdesc/NamingProviderURLWriter-xmbean.xml 2009-09-19 05:49:08 UTC (rev 93783)
@@ -31,7 +31,7 @@
<attribute access="write-only" setMethod="setServer">
<description>Server object from which the OutputDirURL can be obtained if not directly configured</description>
<name>Server</name>
- <type>org.jboss.bootstrap.spi.as.server.JBossASBasedServer</type>
+ <type>org.jboss.bootstrap.api.as.server.JBossASBasedServer</type>
</attribute>
<attribute access="read-write" getMethod="getBootstrapURL" setMethod="setBootstrapURL">
Modified: branches/Branch_5_x/server/src/main/org/jboss/Shutdown.java
===================================================================
--- branches/Branch_5_x/server/src/main/org/jboss/Shutdown.java 2009-09-19 05:35:49 UTC (rev 93782)
+++ branches/Branch_5_x/server/src/main/org/jboss/Shutdown.java 2009-09-19 05:49:08 UTC (rev 93783)
@@ -38,7 +38,7 @@
import javax.naming.Context;
import javax.naming.InitialContext;
-import org.jboss.bootstrap.spi.server.Server;
+import org.jboss.bootstrap.api.server.Server;
import org.jboss.naming.HttpNamingContextFactory;
import org.jboss.security.SecurityAssociation;
import org.jboss.security.SimplePrincipal;
Modified: branches/Branch_5_x/server/src/main/org/jboss/config/ServerConfigUtil.java
===================================================================
--- branches/Branch_5_x/server/src/main/org/jboss/config/ServerConfigUtil.java 2009-09-19 05:35:49 UTC (rev 93782)
+++ branches/Branch_5_x/server/src/main/org/jboss/config/ServerConfigUtil.java 2009-09-19 05:49:08 UTC (rev 93783)
@@ -24,8 +24,8 @@
import java.net.InetAddress;
import java.net.UnknownHostException;
+import org.jboss.bootstrap.api.as.config.JBossASServerConfig;
import org.jboss.bootstrap.spi.as.config.JBossASConfigurationInitializer;
-import org.jboss.bootstrap.spi.as.config.JBossASServerConfig;
/**
* ServerConfigUtil
Modified: branches/Branch_5_x/server/src/main/org/jboss/deployment/JBossEjbParsingDeployer.java
===================================================================
--- branches/Branch_5_x/server/src/main/org/jboss/deployment/JBossEjbParsingDeployer.java 2009-09-19 05:35:49 UTC (rev 93782)
+++ branches/Branch_5_x/server/src/main/org/jboss/deployment/JBossEjbParsingDeployer.java 2009-09-19 05:49:08 UTC (rev 93783)
@@ -23,7 +23,7 @@
import java.net.URL;
-import org.jboss.bootstrap.spi.as.config.JBossASServerConfig;
+import org.jboss.bootstrap.api.as.config.JBossASServerConfig;
import org.jboss.deployers.spi.DeploymentException;
import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.deployers.vfs.spi.deployer.SchemaResolverDeployer;
Modified: branches/Branch_5_x/server/src/main/org/jboss/invocation/http/server/HttpInvoker.java
===================================================================
--- branches/Branch_5_x/server/src/main/org/jboss/invocation/http/server/HttpInvoker.java 2009-09-19 05:35:49 UTC (rev 93782)
+++ branches/Branch_5_x/server/src/main/org/jboss/invocation/http/server/HttpInvoker.java 2009-09-19 05:49:08 UTC (rev 93783)
@@ -32,8 +32,8 @@
import javax.naming.NamingException;
import javax.transaction.Transaction;
+import org.jboss.bootstrap.api.as.config.JBossASServerConfig;
import org.jboss.bootstrap.spi.as.config.JBossASConfigurationInitializer;
-import org.jboss.bootstrap.spi.as.config.JBossASServerConfig;
import org.jboss.invocation.Invocation;
import org.jboss.invocation.Invoker;
import org.jboss.invocation.MarshalledInvocation;
Modified: branches/Branch_5_x/server/src/main/org/jboss/naming/NamingProviderURLWriter.java
===================================================================
--- branches/Branch_5_x/server/src/main/org/jboss/naming/NamingProviderURLWriter.java 2009-09-19 05:35:49 UTC (rev 93782)
+++ branches/Branch_5_x/server/src/main/org/jboss/naming/NamingProviderURLWriter.java 2009-09-19 05:49:08 UTC (rev 93783)
@@ -32,8 +32,7 @@
import java.net.URI;
import java.util.Enumeration;
-import org.jboss.bootstrap.spi.as.server.JBossASBasedServer;
-import org.jboss.bootstrap.spi.as.server.JBossASServer;
+import org.jboss.bootstrap.api.as.server.JBossASBasedServer;
import org.jboss.logging.Logger;
/**
Modified: branches/Branch_5_x/server/src/main/org/jboss/web/WebService.java
===================================================================
--- branches/Branch_5_x/server/src/main/org/jboss/web/WebService.java 2009-09-19 05:35:49 UTC (rev 93782)
+++ branches/Branch_5_x/server/src/main/org/jboss/web/WebService.java 2009-09-19 05:49:08 UTC (rev 93783)
@@ -30,7 +30,7 @@
import javax.management.MBeanServer;
import javax.management.ObjectName;
-import org.jboss.bootstrap.spi.as.config.JBossASServerConfig;
+import org.jboss.bootstrap.api.as.config.JBossASServerConfig;
import org.jboss.config.ServerConfigUtil;
import org.jboss.system.ServiceMBeanSupport;
import org.jboss.util.threadpool.BasicThreadPoolMBean;
Modified: branches/Branch_5_x/server/src/main/org/jboss/web/deployers/AbstractWarDeployment.java
===================================================================
--- branches/Branch_5_x/server/src/main/org/jboss/web/deployers/AbstractWarDeployment.java 2009-09-19 05:35:49 UTC (rev 93782)
+++ branches/Branch_5_x/server/src/main/org/jboss/web/deployers/AbstractWarDeployment.java 2009-09-19 05:49:08 UTC (rev 93783)
@@ -37,7 +37,7 @@
import javax.naming.NamingException;
import org.jboss.beans.metadata.api.annotations.Inject;
-import org.jboss.bootstrap.spi.as.config.JBossASServerConfig;
+import org.jboss.bootstrap.api.as.config.JBossASServerConfig;
import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.deployers.structure.spi.main.MainDeployerStructure;
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
Modified: branches/Branch_5_x/system/.classpath
===================================================================
--- branches/Branch_5_x/system/.classpath 2009-09-19 05:35:49 UTC (rev 93782)
+++ branches/Branch_5_x/system/.classpath 2009-09-19 05:49:08 UTC (rev 93783)
@@ -39,10 +39,10 @@
<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/jbossxb/lib/jboss-xml-binding.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/jboss-bootstrap-spi-as/lib/jboss-bootstrap-spi-as.jar" sourcepath="/thirdparty/jboss/jboss-bootstrap-spi-as/lib/jboss-bootstrap-spi-as-sources.jar"/>
- <classpathentry kind="lib" path="/thirdparty/jboss/jboss-bootstrap-impl-as/lib/jboss-bootstrap-impl-as.jar" sourcepath="/thirdparty/jboss/jboss-bootstrap-impl-as/lib/jboss-bootstrap-impl-as-sources.jar"/>
- <classpathentry kind="lib" path="/thirdparty/jboss/jboss-bootstrap-impl-mc/lib/jboss-bootstrap-impl-mc.jar" sourcepath="/thirdparty/jboss/jboss-bootstrap-impl-mc/lib/jboss-bootstrap-impl-mc-sources.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/jboss-bootstrap-spi-mc/lib/jboss-bootstrap-spi-mc.jar" sourcepath="/thirdparty/jboss/jboss-bootstrap-spi-mc/lib/jboss-bootstrap-spi-mc-sources.jar"/>
- <classpathentry kind="lib" path="/thirdparty/jboss/jboss-bootstrap-impl-base/lib/jboss-bootstrap-impl-base.jar" sourcepath="/thirdparty/jboss/jboss-bootstrap-impl-base/lib/jboss-bootstrap-impl-base-sources.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/jboss-bootstrap-spi/lib/jboss-bootstrap-spi.jar" sourcepath="/thirdparty/jboss/jboss-bootstrap-spi/lib/jboss-bootstrap-spi-sources.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/jboss-bootstrap-api/lib/jboss-bootstrap-api.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/jboss-bootstrap-api-as/lib/jboss-bootstrap-api-as.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/jboss-bootstrap-api-mc/lib/jboss-bootstrap-api-mc.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-09-19 05:35:49 UTC (rev 93782)
+++ branches/Branch_5_x/system/build.xml 2009-09-19 05:49:08 UTC (rev 93783)
@@ -96,8 +96,11 @@
<path id="dependentmodule.classpath">
<path refid="jboss.main.classpath"/>
<path refid="jboss.jboss.bootstrap.spi.as.classpath"/>
+ <path refid="jboss.jboss.bootstrap.api.as.classpath"/>
+ <path refid="jboss.jboss.bootstrap.api.classpath"/>
+ <path refid="jboss.jboss.bootstrap.api.mc.classpath"/>
+ <path refid="jboss.jboss.bootstrap.spi.classpath"/>
<path refid="jboss.jboss.bootstrap.spi.mc.classpath"/>
- <path refid="jboss.jboss.bootstrap.spi.classpath"/>
</path>
<!-- ===== -->
Modified: branches/Branch_5_x/system/src/main/org/jboss/system/server/profileservice/ProfileServiceBootstrap.java
===================================================================
--- branches/Branch_5_x/system/src/main/org/jboss/system/server/profileservice/ProfileServiceBootstrap.java 2009-09-19 05:35:49 UTC (rev 93782)
+++ branches/Branch_5_x/system/src/main/org/jboss/system/server/profileservice/ProfileServiceBootstrap.java 2009-09-19 05:49:08 UTC (rev 93783)
@@ -35,9 +35,9 @@
import org.jboss.beans.info.spi.BeanInfo;
import org.jboss.beans.metadata.spi.BeanMetaData;
+import org.jboss.bootstrap.api.as.config.JBossASBasedServerConfig;
import org.jboss.bootstrap.spi.as.JBossASBootstrap;
-import org.jboss.bootstrap.spi.as.config.JBossASBasedServerConfig;
-import org.jboss.bootstrap.spi.as.server.JBossASBasedServer;
+import org.jboss.bootstrap.spi.as.server.JBossASBasedServerProvider;
import org.jboss.dependency.spi.ControllerContext;
import org.jboss.dependency.spi.ControllerState;
import org.jboss.deployers.client.spi.IncompleteDeploymentException;
@@ -94,7 +94,7 @@
* @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
* @version $Revision$
*/
-public class ProfileServiceBootstrap<K extends JBossASBasedServer<K, T>, T extends JBossASBasedServerConfig<T>>
+public class ProfileServiceBootstrap<K extends JBossASBasedServerProvider<K, T>, T extends JBossASBasedServerConfig<T>>
implements
JBossASBootstrap<K, T>,
KernelRegistryPlugin
Modified: branches/Branch_5_x/system/src/main/org/jboss/system/server/profileservice/repository/clustered/local/JAXBRepositoryContentMetadataPersister.java
===================================================================
--- branches/Branch_5_x/system/src/main/org/jboss/system/server/profileservice/repository/clustered/local/JAXBRepositoryContentMetadataPersister.java 2009-09-19 05:35:49 UTC (rev 93782)
+++ branches/Branch_5_x/system/src/main/org/jboss/system/server/profileservice/repository/clustered/local/JAXBRepositoryContentMetadataPersister.java 2009-09-19 05:49:08 UTC (rev 93783)
@@ -30,7 +30,7 @@
import javax.xml.bind.JAXBContext;
import javax.xml.bind.Marshaller;
-import org.jboss.bootstrap.spi.as.server.JBossASBasedServer;
+import org.jboss.bootstrap.api.as.server.JBossASBasedServer;
import org.jboss.logging.Logger;
import org.jboss.system.server.profileservice.repository.clustered.metadata.RepositoryContentMetadata;
import org.jboss.xb.binding.Unmarshaller;
Modified: branches/Branch_5_x/system/src/main/org/jboss/system/tools/DeploymentScanner.java
===================================================================
--- branches/Branch_5_x/system/src/main/org/jboss/system/tools/DeploymentScanner.java 2009-09-19 05:35:49 UTC (rev 93782)
+++ branches/Branch_5_x/system/src/main/org/jboss/system/tools/DeploymentScanner.java 2009-09-19 05:49:08 UTC (rev 93783)
@@ -28,7 +28,7 @@
import org.jboss.aop.microcontainer.aspects.jmx.JMX;
import org.jboss.beans.metadata.api.annotations.Start;
import org.jboss.beans.metadata.api.annotations.Stop;
-import org.jboss.bootstrap.spi.as.config.JBossASServerConfig;
+import org.jboss.bootstrap.api.as.config.JBossASServerConfig;
import org.jboss.util.StringPropertyReplacer;
/**
Modified: branches/Branch_5_x/system/src/tests/org/jboss/test/server/profileservice/MainWithSimpleHotDeployTestCase.java
===================================================================
--- branches/Branch_5_x/system/src/tests/org/jboss/test/server/profileservice/MainWithSimpleHotDeployTestCase.java 2009-09-19 05:35:49 UTC (rev 93782)
+++ branches/Branch_5_x/system/src/tests/org/jboss/test/server/profileservice/MainWithSimpleHotDeployTestCase.java 2009-09-19 05:49:08 UTC (rev 93783)
@@ -25,8 +25,8 @@
import java.security.CodeSource;
import org.jboss.Main;
-import org.jboss.bootstrap.impl.as.server.JBossASServerImpl;
-import org.jboss.bootstrap.spi.as.server.JBossASServer;
+import org.jboss.bootstrap.api.as.server.JBossASServer;
+import org.jboss.bootstrap.spi.as.server.JBossASServerProvider;
import org.jboss.dependency.spi.ControllerState;
import org.jboss.kernel.Kernel;
import org.jboss.kernel.spi.registry.KernelRegistry;
@@ -101,9 +101,9 @@
String[] args = {"-c", "defaulthotdeploy", "-Djboss.server.deployerBeansPrefix="+deployPrefix};
Main main = new Main();
main.boot(args);
- JBossASServer server = (JBossASServer) main.getServer();
- assertTrue("Server", server instanceof JBossASServerImpl);
- JBossASServerImpl serverImpl = (JBossASServerImpl) server;
+ JBossASServer server = main.getServer();
+ assertTrue("Server", server instanceof JBossASServerProvider);
+ JBossASServerProvider serverImpl = (JBossASServerProvider) server;
// Validate that the expected deployment beans exist
Kernel kernel = serverImpl.getKernel();
Modified: branches/Branch_5_x/system/src/tests/org/jboss/test/server/profileservice/support/MockServer.java
===================================================================
--- branches/Branch_5_x/system/src/tests/org/jboss/test/server/profileservice/support/MockServer.java 2009-09-19 05:35:49 UTC (rev 93782)
+++ branches/Branch_5_x/system/src/tests/org/jboss/test/server/profileservice/support/MockServer.java 2009-09-19 05:49:08 UTC (rev 93783)
@@ -25,15 +25,15 @@
import java.util.EnumSet;
import java.util.Map;
+import org.jboss.bootstrap.api.as.config.JBossASServerConfig;
+import org.jboss.bootstrap.api.as.server.JBossASServer;
+import org.jboss.bootstrap.api.config.InvalidConfigurationException;
+import org.jboss.bootstrap.api.lifecycle.LifecycleEventException;
+import org.jboss.bootstrap.api.lifecycle.LifecycleEventHandler;
+import org.jboss.bootstrap.api.lifecycle.LifecycleState;
import org.jboss.bootstrap.spi.Bootstrap;
-import org.jboss.bootstrap.spi.as.config.JBossASServerConfig;
-import org.jboss.bootstrap.spi.as.server.JBossASServer;
import org.jboss.bootstrap.spi.config.ConfigurationInitializer;
import org.jboss.bootstrap.spi.config.ConfigurationValidator;
-import org.jboss.bootstrap.spi.config.InvalidConfigurationException;
-import org.jboss.bootstrap.spi.lifecycle.LifecycleEventException;
-import org.jboss.bootstrap.spi.lifecycle.LifecycleEventHandler;
-import org.jboss.bootstrap.spi.lifecycle.LifecycleState;
import org.jboss.bootstrap.spi.server.ServerInitializer;
import org.jboss.kernel.Kernel;
import org.jboss.kernel.spi.deployment.KernelDeployment;
@@ -245,5 +245,12 @@
// TODO Auto-generated method stub
return null;
}
+
+ @Override
+ public void stop() throws IllegalStateException, Exception
+ {
+ this.shutdown();
+
+ }
}
Modified: branches/Branch_5_x/system/src/tests/org/jboss/test/server/profileservice/support/MockServerConfig.java
===================================================================
--- branches/Branch_5_x/system/src/tests/org/jboss/test/server/profileservice/support/MockServerConfig.java 2009-09-19 05:35:49 UTC (rev 93782)
+++ branches/Branch_5_x/system/src/tests/org/jboss/test/server/profileservice/support/MockServerConfig.java 2009-09-19 05:49:08 UTC (rev 93783)
@@ -25,7 +25,7 @@
import java.util.Map;
import java.util.Properties;
-import org.jboss.bootstrap.spi.as.config.JBossASServerConfig;
+import org.jboss.bootstrap.api.as.config.JBossASServerConfig;
/**
* @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
Modified: branches/Branch_5_x/system/src/tests/org/jboss/test/server/profileservice/test/AbstractProfileServiceTestBase.java
===================================================================
--- branches/Branch_5_x/system/src/tests/org/jboss/test/server/profileservice/test/AbstractProfileServiceTestBase.java 2009-09-19 05:35:49 UTC (rev 93782)
+++ branches/Branch_5_x/system/src/tests/org/jboss/test/server/profileservice/test/AbstractProfileServiceTestBase.java 2009-09-19 05:49:08 UTC (rev 93783)
@@ -25,8 +25,8 @@
import java.net.MalformedURLException;
import java.net.URL;
-import org.jboss.bootstrap.spi.as.config.JBossASServerConfig;
-import org.jboss.bootstrap.spi.as.server.JBossASServer;
+import org.jboss.bootstrap.api.as.config.JBossASServerConfig;
+import org.jboss.bootstrap.api.as.server.JBossASServer;
import org.jboss.deployers.client.spi.main.MainDeployer;
import org.jboss.system.server.profileservice.repository.AbstractProfileFactory;
import org.jboss.test.BaseTestCase;
Modified: branches/Branch_5_x/system-jmx/.classpath
===================================================================
--- branches/Branch_5_x/system-jmx/.classpath 2009-09-19 05:35:49 UTC (rev 93782)
+++ branches/Branch_5_x/system-jmx/.classpath 2009-09-19 05:49:08 UTC (rev 93783)
@@ -24,8 +24,11 @@
<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-spi-as/lib/jboss-bootstrap-spi-as.jar"/>
- <classpathentry kind="lib" path="/thirdparty/jboss/jboss-bootstrap-spi/lib/jboss-bootstrap-spi.jar"/>
- <classpathentry kind="lib" path="/thirdparty/jboss/jboss-bootstrap-spi-mc/lib/jboss-bootstrap-spi-mc.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/jboss-bootstrap-api/lib/jboss-bootstrap-api.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/jboss-bootstrap-api-as/lib/jboss-bootstrap-api-as.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/jboss-bootstrap-spi-as/lib/jboss-bootstrap-spi-as.jar" sourcepath="/thirdparty/jboss/jboss-bootstrap-spi-as/lib/jboss-bootstrap-spi-as-sources.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/jboss-bootstrap-spi-mc/lib/jboss-bootstrap-spi-mc.jar" sourcepath="/thirdparty/jboss/jboss-bootstrap-spi-mc/lib/jboss-bootstrap-spi-mc-sources.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/jboss-bootstrap-api-mc/lib/jboss-bootstrap-api-mc.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/jboss-bootstrap-spi/lib/jboss-bootstrap-spi.jar" sourcepath="/thirdparty/jboss/jboss-bootstrap-spi/lib/jboss-bootstrap-spi-sources.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-09-19 05:35:49 UTC (rev 93782)
+++ branches/Branch_5_x/system-jmx/build.xml 2009-09-19 05:49:08 UTC (rev 93783)
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE project [
<!ENTITY buildmagic SYSTEM "../tools/etc/buildmagic/buildmagic.ent">
- <!ENTITY libraries SYSTEM "../thirdparty/libraries.ent">
- <!ENTITY modules SYSTEM "../tools/etc/buildmagic/modules.ent">
- <!ENTITY targets SYSTEM "../tools/etc/buildmagic/targets.ent">
+<!ENTITY libraries SYSTEM "../thirdparty/libraries.ent">
+<!ENTITY modules SYSTEM "../tools/etc/buildmagic/modules.ent">
+<!ENTITY targets SYSTEM "../tools/etc/buildmagic/targets.ent">
]>
<!-- ====================================================================== -->
@@ -19,11 +19,11 @@
<project default="main" name="JBoss/SystemJMX">
- <!-- ================================================================== -->
- <!-- Setup -->
- <!-- ================================================================== -->
+ <!-- ================================================================== -->
+ <!-- Setup -->
+ <!-- ================================================================== -->
- <!--
+ <!--
| Include the common Buildmagic elements.
|
| This defines several different targets, properties and paths.
@@ -38,110 +38,111 @@
&targets;
<!-- ================================================================== -->
- <!-- Configuration -->
- <!-- ================================================================== -->
+ <!-- Configuration -->
+ <!-- ================================================================== -->
- <!--
+ <!--
| Configure the build system.
|
| This target is invoked by the Buildmagic initialization logic and
| should contain module specific configuration elements.
-->
- <target name="configure" unless="configure.disable">
+ <target name="configure" unless="configure.disable">
- <!-- =================== -->
- <!-- Basic Configuration -->
- <!-- =================== -->
+ <!-- =================== -->
+ <!-- Basic Configuration -->
+ <!-- =================== -->
- <!-- Module name(s) & version -->
- <property name="module.name" value="system-jmx"/>
- <property name="module.Name" value="JBoss SystemJMX"/>
- <property name="module.version" value="DEV"/>
+ <!-- Module name(s) & version -->
+ <property name="module.name" value="system-jmx" />
+ <property name="module.Name" value="JBoss SystemJMX" />
+ <property name="module.version" value="DEV" />
- <!-- ========= -->
- <!-- Libraries -->
- <!-- ========= -->
+ <!-- ========= -->
+ <!-- Libraries -->
+ <!-- ========= -->
&libraries;
<!-- The combined library classpath -->
- <path id="library.classpath">
- <path refid="junit.junit.classpath"/>
- <path refid="gnu.getopt.classpath"/>
- <path refid="apache.xerces.classpath"/>
- <path refid="apache.log4j.classpath"/>
- <path refid="apache.commons.classpath"/>
- <path refid="oswego.concurrent.classpath"/>
- <path refid="dom4j.dom4j.classpath"/>
- <path refid="jboss.jbossxb.classpath"/>
- <path refid="sun.jaxb.classpath"/>
- <path refid="jboss.jboss.cl.classpath"/>
- <path refid="jboss.jboss.man.classpath"/>
- <path refid="jboss.jboss.mdr.classpath"/>
- <path refid="jboss.jboss.deployers.classpath"/>
- <path refid="jboss.jboss.reflect.classpath"/>
- <path refid="jboss.microcontainer.classpath"/>
- <path refid="jboss.integration.classpath"/>
- <path refid="jboss.jboss.vfs.classpath"/>
- <path refid="jboss.common.core.classpath"/>
- <path refid="jboss.common.logging.spi.classpath"/>
- <path refid="jboss.common.logging.log4j.classpath"/>
- <path refid="jboss.common.logging.jdk.classpath"/>
- </path>
+ <path id="library.classpath">
+ <path refid="junit.junit.classpath" />
+ <path refid="gnu.getopt.classpath" />
+ <path refid="apache.xerces.classpath" />
+ <path refid="apache.log4j.classpath" />
+ <path refid="apache.commons.classpath" />
+ <path refid="oswego.concurrent.classpath" />
+ <path refid="dom4j.dom4j.classpath" />
+ <path refid="jboss.jbossxb.classpath" />
+ <path refid="sun.jaxb.classpath" />
+ <path refid="jboss.jboss.cl.classpath" />
+ <path refid="jboss.jboss.man.classpath" />
+ <path refid="jboss.jboss.mdr.classpath" />
+ <path refid="jboss.jboss.deployers.classpath" />
+ <path refid="jboss.jboss.reflect.classpath" />
+ <path refid="jboss.microcontainer.classpath" />
+ <path refid="jboss.integration.classpath" />
+ <path refid="jboss.jboss.vfs.classpath" />
+ <path refid="jboss.common.core.classpath" />
+ <path refid="jboss.common.logging.spi.classpath" />
+ <path refid="jboss.common.logging.log4j.classpath" />
+ <path refid="jboss.common.logging.jdk.classpath" />
+ </path>
- <!-- ======= -->
- <!-- Modules -->
- <!-- ======= -->
+ <!-- ======= -->
+ <!-- Modules -->
+ <!-- ======= -->
&modules;
<!-- The combined dependant module classpath -->
- <path id="dependentmodule.classpath">
- <path refid="jboss.j2se.classpath"/>
- <path refid="jboss.mbeans.classpath"/>
- <path refid="jboss.jboss.bootstrap.spi.as.classpath"/>
- <path refid="jboss.jboss.bootstrap.spi.mc.classpath"/>
- <path refid="jboss.jboss.bootstrap.spi.classpath"/>
- <path refid="jboss.system.classpath"/>
- </path>
+ <path id="dependentmodule.classpath">
+ <path refid="jboss.j2se.classpath" />
+ <path refid="jboss.mbeans.classpath" />
+ <path refid="jboss.jboss.bootstrap.api.as.classpath" />
+ <path refid="jboss.jboss.bootstrap.api.mc.classpath" />
+ <path refid="jboss.jboss.bootstrap.api.classpath" />
+ <path refid="jboss.jboss.bootstrap.spi.classpath" />
+ <path refid="jboss.jboss.bootstrap.spi.as.classpath" />
+ <path refid="jboss.jboss.bootstrap.spi.mc.classpath" />
+ <path refid="jboss.system.classpath" />
+ </path>
- <!-- ===== -->
- <!-- Tasks -->
- <!-- ===== -->
+ <!-- ===== -->
+ <!-- Tasks -->
+ <!-- ===== -->
- <property name="jar.prefix" value="jboss-system-jmx"/>
- <property name="javac.target" value="1.5"/>
- <property name="javac.source" value="1.5"/>
- <property name="jar.client.includes"
- value="org/jboss/deployment/DeploymentException*,
+ <property name="jar.prefix" value="jboss-system-jmx" />
+ <property name="javac.target" value="1.5" />
+ <property name="javac.source" value="1.5" />
+ <property name="jar.client.includes" value="org/jboss/deployment/DeploymentException*,
org/jboss/deployment/IncompleteDeploymentException*,
org/jboss/deployment/Deployer*,
org/jboss/system/Service.class,
org/jboss/system/server/ServerLoader*.class,
org/jboss/system/server/Server.class,
org/jboss/system/server/ServerConfig.class,
- **/*MBean.class"
- />
+ **/*MBean.class" />
- <patternset id="compile-resources.filter.pattern">
- <include name="**/*"/>
- <exclude name="tests/**"/>
- </patternset>
+ <patternset id="compile-resources.filter.pattern">
+ <include name="**/*" />
+ <exclude name="tests/**" />
+ </patternset>
- <patternset id="compile-resources.pattern">
- <include name="tests/**"/>
- </patternset>
+ <patternset id="compile-resources.pattern">
+ <include name="tests/**" />
+ </patternset>
- <call target="_default:task-init"/>
+ <call target="_default:task-init" />
- </target>
+ </target>
- <!-- ================================================================== -->
- <!-- Compile -->
- <!-- ================================================================== -->
+ <!-- ================================================================== -->
+ <!-- Compile -->
+ <!-- ================================================================== -->
- <!--
+ <!--
| Compile everything.
|
| This target should depend on other compile-* targets for each
@@ -149,45 +150,43 @@
| documentation compiles.
-->
- <target name="compile"
- description="Compile all source files."
- depends="_default:compile-classes,
+ <target name="compile" description="Compile all source files." depends="_default:compile-classes,
_default:compile-resources,
- _default:compile-etc"/>
+ _default:compile-etc" />
- <!-- ================================================================== -->
- <!-- Archives -->
- <!-- ================================================================== -->
+ <!-- ================================================================== -->
+ <!-- Archives -->
+ <!-- ================================================================== -->
- <!--
+ <!--
| Build all jar files.
-->
- <target name="module-jars" >
+ <target name="module-jars">
- <!-- Server and client jars -->
- <call target="_default:server-client-jars"/>
-
- <!--
+ <!-- Server and client jars -->
+ <call target="_default:server-client-jars" />
+
+ <!--
| JBoss/Testsuite Support
-->
- <!-- testsuite-support.jar -->
- <jar jarfile="${build.lib}/testsuite-support.jar" manifest="${build.etc}/default.mf">
- <fileset dir="${build.classes}">
- <include name="org/jboss/deployment/**"/>
- <include name="org/jboss/system/Service.class"/>
- <include name="org/jboss/system/ServiceMBean.class"/>
- <include name="org/jboss/system/*MBeanSupport.class"/>
- <include name="org/jboss/system/MBeanClassLoader*.class"/>
- <include name="org/jboss/system/UnifiedClassLoader*.class"/>
- <include name="org/jboss/system/ServiceLibraries*.class"/>
- <include name="org/jboss/system/server/*MBean.class"/>
- <include name="org/jboss/system/server/ServerConfigLocator.class"/>
- <include name="org/jboss/system/server/ServerConfig.class"/>
- <include name="org/jboss/system/server/Server.class"/>
- </fileset>
- </jar>
+ <!-- testsuite-support.jar -->
+ <jar jarfile="${build.lib}/testsuite-support.jar" manifest="${build.etc}/default.mf">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/deployment/**" />
+ <include name="org/jboss/system/Service.class" />
+ <include name="org/jboss/system/ServiceMBean.class" />
+ <include name="org/jboss/system/*MBeanSupport.class" />
+ <include name="org/jboss/system/MBeanClassLoader*.class" />
+ <include name="org/jboss/system/UnifiedClassLoader*.class" />
+ <include name="org/jboss/system/ServiceLibraries*.class" />
+ <include name="org/jboss/system/server/*MBean.class" />
+ <include name="org/jboss/system/server/ServerConfigLocator.class" />
+ <include name="org/jboss/system/server/ServerConfig.class" />
+ <include name="org/jboss/system/server/Server.class" />
+ </fileset>
+ </jar>
- </target>
+ </target>
</project>
Modified: branches/Branch_5_x/system-jmx/src/main/org/jboss/deployment/DeploymentInfo.java
===================================================================
--- branches/Branch_5_x/system-jmx/src/main/org/jboss/deployment/DeploymentInfo.java 2009-09-19 05:35:49 UTC (rev 93782)
+++ branches/Branch_5_x/system-jmx/src/main/org/jboss/deployment/DeploymentInfo.java 2009-09-19 05:49:08 UTC (rev 93783)
@@ -21,25 +21,32 @@
*/
package org.jboss.deployment;
-import org.jboss.logging.Logger;
-import org.jboss.mx.loading.LoaderRepositoryFactory;
-import org.jboss.mx.loading.LoaderRepositoryFactory.LoaderRepositoryConfig;
-import org.jboss.mx.loading.RepositoryClassLoader;
-import org.jboss.util.collection.ListSet;
-import org.jboss.util.file.Files;
-import org.w3c.dom.Document;
-
-import javax.management.MBeanServer;
-import javax.management.ObjectName;
import java.io.File;
import java.io.FileInputStream;
import java.io.Serializable;
import java.net.URL;
import java.net.URLClassLoader;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
import java.util.jar.JarFile;
import java.util.jar.Manifest;
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
+
+import org.jboss.logging.Logger;
+import org.jboss.mx.loading.LoaderRepositoryFactory;
+import org.jboss.mx.loading.RepositoryClassLoader;
+import org.jboss.mx.loading.LoaderRepositoryFactory.LoaderRepositoryConfig;
+import org.jboss.util.collection.ListSet;
+import org.jboss.util.file.Files;
+import org.w3c.dom.Document;
+
/**
* Service Deployment Info .
*
Modified: branches/Branch_5_x/system-jmx/src/main/org/jboss/deployment/MainDeployer.java
===================================================================
--- branches/Branch_5_x/system-jmx/src/main/org/jboss/deployment/MainDeployer.java 2009-09-19 05:35:49 UTC (rev 93782)
+++ branches/Branch_5_x/system-jmx/src/main/org/jboss/deployment/MainDeployer.java 2009-09-19 05:49:08 UTC (rev 93783)
@@ -51,7 +51,7 @@
import javax.management.Notification;
import javax.management.ObjectName;
-import org.jboss.bootstrap.spi.as.config.JBossASServerConfig;
+import org.jboss.bootstrap.api.as.config.JBossASServerConfig;
import org.jboss.deployers.client.spi.DeployerClient;
import org.jboss.deployers.client.spi.Deployment;
import org.jboss.deployers.structure.spi.DeploymentContext;
Modified: branches/Branch_5_x/system-jmx/src/main/org/jboss/deployment/MainDeployerMBean.java
===================================================================
--- branches/Branch_5_x/system-jmx/src/main/org/jboss/deployment/MainDeployerMBean.java 2009-09-19 05:35:49 UTC (rev 93782)
+++ branches/Branch_5_x/system-jmx/src/main/org/jboss/deployment/MainDeployerMBean.java 2009-09-19 05:49:08 UTC (rev 93783)
@@ -25,6 +25,7 @@
import java.net.MalformedURLException;
import java.net.URL;
import java.util.Collection;
+
import javax.management.ObjectName;
import org.jboss.deployers.client.spi.DeployerClient;
Modified: branches/Branch_5_x/system-jmx/src/main/org/jboss/deployment/SARDeployer.java
===================================================================
--- branches/Branch_5_x/system-jmx/src/main/org/jboss/deployment/SARDeployer.java 2009-09-19 05:35:49 UTC (rev 93782)
+++ branches/Branch_5_x/system-jmx/src/main/org/jboss/deployment/SARDeployer.java 2009-09-19 05:49:08 UTC (rev 93783)
@@ -43,7 +43,7 @@
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
-import org.jboss.bootstrap.spi.as.config.JBossASServerConfig;
+import org.jboss.bootstrap.api.as.config.JBossASServerConfig;
import org.jboss.mx.loading.LoaderRepositoryFactory;
import org.jboss.mx.loading.LoaderRepositoryFactory.LoaderRepositoryConfig;
import org.jboss.mx.util.MBeanProxyExt;
Modified: branches/Branch_5_x/system-jmx/src/main/org/jboss/deployment/SerializableDeploymentInfo.java
===================================================================
--- branches/Branch_5_x/system-jmx/src/main/org/jboss/deployment/SerializableDeploymentInfo.java 2009-09-19 05:35:49 UTC (rev 93782)
+++ branches/Branch_5_x/system-jmx/src/main/org/jboss/deployment/SerializableDeploymentInfo.java 2009-09-19 05:49:08 UTC (rev 93783)
@@ -23,7 +23,6 @@
// $Id$
-import javax.management.ObjectName;
import java.io.Serializable;
import java.net.URL;
import java.util.ArrayList;
@@ -31,6 +30,8 @@
import java.util.Date;
import java.util.List;
+import javax.management.ObjectName;
+
/**
* DeploymentInfo for remote access by the DeploymentManager.
* It provides a serializable subset of the information available in DeploymentInfo.
Modified: branches/Branch_5_x/system-jmx/src/main/org/jboss/deployment/SubDeployerSupport.java
===================================================================
--- branches/Branch_5_x/system-jmx/src/main/org/jboss/deployment/SubDeployerSupport.java 2009-09-19 05:35:49 UTC (rev 93782)
+++ branches/Branch_5_x/system-jmx/src/main/org/jboss/deployment/SubDeployerSupport.java 2009-09-19 05:49:08 UTC (rev 93783)
@@ -34,7 +34,7 @@
import javax.management.Notification;
-import org.jboss.bootstrap.spi.as.config.JBossASServerConfig;
+import org.jboss.bootstrap.api.as.config.JBossASServerConfig;
import org.jboss.mx.util.MBeanProxyExt;
import org.jboss.system.ServiceMBeanSupport;
import org.jboss.system.server.ServerConfigLocator;
Modified: branches/Branch_5_x/system-jmx/src/main/org/jboss/deployment/XSLSubDeployer.java
===================================================================
--- branches/Branch_5_x/system-jmx/src/main/org/jboss/deployment/XSLSubDeployer.java 2009-09-19 05:35:49 UTC (rev 93782)
+++ branches/Branch_5_x/system-jmx/src/main/org/jboss/deployment/XSLSubDeployer.java 2009-09-19 05:49:08 UTC (rev 93783)
@@ -37,7 +37,7 @@
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamSource;
-import org.jboss.bootstrap.spi.as.config.JBossASServerConfig;
+import org.jboss.bootstrap.api.as.config.JBossASServerConfig;
import org.jboss.mx.util.MBeanProxyExt;
import org.jboss.util.xml.DOMWriter;
import org.jboss.util.xml.JBossEntityResolver;
Modified: branches/Branch_5_x/system-jmx/src/main/org/jboss/deployment/scanner/AlphaNumericDeploymentSorter.java
===================================================================
--- branches/Branch_5_x/system-jmx/src/main/org/jboss/deployment/scanner/AlphaNumericDeploymentSorter.java 2009-09-19 05:35:49 UTC (rev 93782)
+++ branches/Branch_5_x/system-jmx/src/main/org/jboss/deployment/scanner/AlphaNumericDeploymentSorter.java 2009-09-19 05:49:08 UTC (rev 93783)
@@ -21,11 +21,11 @@
*/
package org.jboss.deployment.scanner;
+import java.net.URL;
+import java.util.Comparator;
+
import org.jboss.deployment.DefaultDeploymentSorter;
-import java.util.Comparator;
-import java.net.URL;
-
/**
* This is simialr to the PrefixDeploymentSorter in that it will order
* files that do not start with a numeric value before those that do.
Modified: branches/Branch_5_x/system-jmx/src/main/org/jboss/deployment/scanner/DeploymentFilter.java
===================================================================
--- branches/Branch_5_x/system-jmx/src/main/org/jboss/deployment/scanner/DeploymentFilter.java 2009-09-19 05:35:49 UTC (rev 93782)
+++ branches/Branch_5_x/system-jmx/src/main/org/jboss/deployment/scanner/DeploymentFilter.java 2009-09-19 05:49:08 UTC (rev 93783)
@@ -21,13 +21,13 @@
*/
package org.jboss.deployment.scanner;
+import java.io.File;
import java.io.FileFilter;
-import java.io.File;
+import java.net.URL;
+import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collections;
import java.util.Comparator;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.net.URL;
import org.jboss.net.protocol.URLLister;
Modified: branches/Branch_5_x/system-jmx/src/main/org/jboss/deployment/scanner/PrefixDeploymentSorter.java
===================================================================
--- branches/Branch_5_x/system-jmx/src/main/org/jboss/deployment/scanner/PrefixDeploymentSorter.java 2009-09-19 05:35:49 UTC (rev 93782)
+++ branches/Branch_5_x/system-jmx/src/main/org/jboss/deployment/scanner/PrefixDeploymentSorter.java 2009-09-19 05:49:08 UTC (rev 93783)
@@ -21,10 +21,11 @@
*/
package org.jboss.deployment.scanner;
+import java.net.URL;
import java.util.Comparator;
-import java.net.URL;
+
+import org.jboss.deployment.DefaultDeploymentSorter;
import org.jboss.deployment.DeploymentSorter;
-import org.jboss.deployment.DefaultDeploymentSorter;
/**
* <p>This class is a comparator to sort deployment URLs based on the existence
Modified: branches/Branch_5_x/system-jmx/src/main/org/jboss/deployment/scanner/URLDeploymentScanner.java
===================================================================
--- branches/Branch_5_x/system-jmx/src/main/org/jboss/deployment/scanner/URLDeploymentScanner.java 2009-09-19 05:35:49 UTC (rev 93782)
+++ branches/Branch_5_x/system-jmx/src/main/org/jboss/deployment/scanner/URLDeploymentScanner.java 2009-09-19 05:49:08 UTC (rev 93783)
@@ -39,7 +39,7 @@
import javax.management.MBeanServer;
import javax.management.ObjectName;
-import org.jboss.bootstrap.spi.as.config.JBossASServerConfig;
+import org.jboss.bootstrap.api.as.config.JBossASServerConfig;
import org.jboss.deployment.DefaultDeploymentSorter;
import org.jboss.deployment.IncompleteDeploymentException;
import org.jboss.mx.util.JMXExceptionDecoder;
Modified: branches/Branch_5_x/system-jmx/src/main/org/jboss/system/ServiceContext.java
===================================================================
--- branches/Branch_5_x/system-jmx/src/main/org/jboss/system/ServiceContext.java 2009-09-19 05:35:49 UTC (rev 93782)
+++ branches/Branch_5_x/system-jmx/src/main/org/jboss/system/ServiceContext.java 2009-09-19 05:49:08 UTC (rev 93783)
@@ -25,6 +25,7 @@
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
+
import javax.management.ObjectName;
/**
Modified: branches/Branch_5_x/system-jmx/src/main/org/jboss/system/ServiceController.java
===================================================================
--- branches/Branch_5_x/system-jmx/src/main/org/jboss/system/ServiceController.java 2009-09-19 05:35:49 UTC (rev 93782)
+++ branches/Branch_5_x/system-jmx/src/main/org/jboss/system/ServiceController.java 2009-09-19 05:49:08 UTC (rev 93783)
@@ -28,6 +28,7 @@
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArrayList;
+
import javax.management.MBeanRegistration;
import javax.management.MBeanServer;
import javax.management.Notification;
Modified: branches/Branch_5_x/system-jmx/src/main/org/jboss/system/ServiceDynamicMBeanSupport.java
===================================================================
--- branches/Branch_5_x/system-jmx/src/main/org/jboss/system/ServiceDynamicMBeanSupport.java 2009-09-19 05:35:49 UTC (rev 93782)
+++ branches/Branch_5_x/system-jmx/src/main/org/jboss/system/ServiceDynamicMBeanSupport.java 2009-09-19 05:49:08 UTC (rev 93783)
@@ -21,7 +21,6 @@
*/
package org.jboss.system;
-import java.util.List;
import javax.management.Attribute;
import javax.management.AttributeList;
import javax.management.AttributeNotFoundException;
Modified: branches/Branch_5_x/system-jmx/src/main/org/jboss/system/deployers/SARDeployer.java
===================================================================
--- branches/Branch_5_x/system-jmx/src/main/org/jboss/system/deployers/SARDeployer.java 2009-09-19 05:35:49 UTC (rev 93782)
+++ branches/Branch_5_x/system-jmx/src/main/org/jboss/system/deployers/SARDeployer.java 2009-09-19 05:49:08 UTC (rev 93783)
@@ -25,7 +25,7 @@
import java.util.ArrayList;
import java.util.List;
-import org.jboss.bootstrap.spi.as.config.JBossASServerConfig;
+import org.jboss.bootstrap.api.as.config.JBossASServerConfig;
import org.jboss.deployers.spi.DeploymentException;
import org.jboss.deployers.vfs.spi.deployer.JAXPDeployer;
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
Modified: branches/Branch_5_x/system-jmx/src/main/org/jboss/system/microcontainer/ConfigureAction.java
===================================================================
--- branches/Branch_5_x/system-jmx/src/main/org/jboss/system/microcontainer/ConfigureAction.java 2009-09-19 05:35:49 UTC (rev 93782)
+++ branches/Branch_5_x/system-jmx/src/main/org/jboss/system/microcontainer/ConfigureAction.java 2009-09-19 05:49:08 UTC (rev 93783)
@@ -26,7 +26,6 @@
import javax.management.MBeanServer;
import javax.management.ObjectName;
-import org.jboss.system.ServiceBinding;
import org.jboss.system.ServiceConfigurator;
import org.jboss.system.ServiceContext;
import org.jboss.system.ServiceController;
Modified: branches/Branch_5_x/system-jmx/src/main/org/jboss/system/microcontainer/ServiceControllerContext.java
===================================================================
--- branches/Branch_5_x/system-jmx/src/main/org/jboss/system/microcontainer/ServiceControllerContext.java 2009-09-19 05:35:49 UTC (rev 93782)
+++ branches/Branch_5_x/system-jmx/src/main/org/jboss/system/microcontainer/ServiceControllerContext.java 2009-09-19 05:49:08 UTC (rev 93783)
@@ -24,6 +24,7 @@
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.Iterator;
+
import javax.management.Attribute;
import javax.management.MBeanServer;
import javax.management.ObjectName;
Modified: branches/Branch_5_x/system-jmx/src/main/org/jboss/system/microcontainer/ServiceProxy.java
===================================================================
--- branches/Branch_5_x/system-jmx/src/main/org/jboss/system/microcontainer/ServiceProxy.java 2009-09-19 05:35:49 UTC (rev 93782)
+++ branches/Branch_5_x/system-jmx/src/main/org/jboss/system/microcontainer/ServiceProxy.java 2009-09-19 05:49:08 UTC (rev 93783)
@@ -26,6 +26,7 @@
import java.lang.reflect.Proxy;
import java.util.HashMap;
import java.util.Map;
+
import javax.management.MBeanInfo;
import javax.management.MBeanOperationInfo;
import javax.management.MBeanServer;
Modified: branches/Branch_5_x/system-jmx/src/main/org/jboss/system/microcontainer/jmx/ServiceControllerRegistrationLifecycleCallback.java
===================================================================
--- branches/Branch_5_x/system-jmx/src/main/org/jboss/system/microcontainer/jmx/ServiceControllerRegistrationLifecycleCallback.java 2009-09-19 05:35:49 UTC (rev 93782)
+++ branches/Branch_5_x/system-jmx/src/main/org/jboss/system/microcontainer/jmx/ServiceControllerRegistrationLifecycleCallback.java 2009-09-19 05:49:08 UTC (rev 93783)
@@ -23,6 +23,7 @@
import java.util.HashMap;
import java.util.Map;
+
import javax.management.MBeanServer;
import javax.management.ObjectName;
import javax.management.StandardMBean;
Modified: branches/Branch_5_x/system-jmx/src/main/org/jboss/system/pm/NullAttributePersistenceManager.java
===================================================================
--- branches/Branch_5_x/system-jmx/src/main/org/jboss/system/pm/NullAttributePersistenceManager.java 2009-09-19 05:35:49 UTC (rev 93782)
+++ branches/Branch_5_x/system-jmx/src/main/org/jboss/system/pm/NullAttributePersistenceManager.java 2009-09-19 05:49:08 UTC (rev 93783)
@@ -22,6 +22,7 @@
package org.jboss.system.pm;
import javax.management.AttributeList;
+
import org.jboss.mx.persistence.AttributePersistenceManager;
import org.w3c.dom.Element;
/**
Modified: branches/Branch_5_x/system-jmx/src/main/org/jboss/system/server/ServerConfigImpl.java
===================================================================
--- branches/Branch_5_x/system-jmx/src/main/org/jboss/system/server/ServerConfigImpl.java 2009-09-19 05:35:49 UTC (rev 93782)
+++ branches/Branch_5_x/system-jmx/src/main/org/jboss/system/server/ServerConfigImpl.java 2009-09-19 05:49:08 UTC (rev 93783)
@@ -25,7 +25,7 @@
import java.util.Map;
import java.util.Properties;
-import org.jboss.bootstrap.spi.as.config.JBossASBasedServerConfig;
+import org.jboss.bootstrap.api.as.config.JBossASBasedServerConfig;
/**
* An mbean wrapper for the BaseServerConfig that exposes the config as the
Modified: branches/Branch_5_x/system-jmx/src/main/org/jboss/system/server/ServerConfigImplMBean.java
===================================================================
--- branches/Branch_5_x/system-jmx/src/main/org/jboss/system/server/ServerConfigImplMBean.java 2009-09-19 05:35:49 UTC (rev 93782)
+++ branches/Branch_5_x/system-jmx/src/main/org/jboss/system/server/ServerConfigImplMBean.java 2009-09-19 05:49:08 UTC (rev 93783)
@@ -23,7 +23,7 @@
import javax.management.ObjectName;
-import org.jboss.bootstrap.spi.as.config.JBossASBasedServerConfig;
+import org.jboss.bootstrap.api.as.config.JBossASBasedServerConfig;
import org.jboss.mx.util.ObjectNameFactory;
/**
Modified: branches/Branch_5_x/system-jmx/src/main/org/jboss/system/server/ServerConfigLocator.java
===================================================================
--- branches/Branch_5_x/system-jmx/src/main/org/jboss/system/server/ServerConfigLocator.java 2009-09-19 05:35:49 UTC (rev 93782)
+++ branches/Branch_5_x/system-jmx/src/main/org/jboss/system/server/ServerConfigLocator.java 2009-09-19 05:49:08 UTC (rev 93783)
@@ -21,7 +21,7 @@
*/
package org.jboss.system.server;
-import org.jboss.bootstrap.spi.as.config.JBossASServerConfig;
+import org.jboss.bootstrap.api.as.config.JBossASServerConfig;
import org.jboss.mx.util.MBeanProxyExt;
/**
Modified: branches/Branch_5_x/system-jmx/src/main/org/jboss/system/server/ServerImplMBean.java
===================================================================
--- branches/Branch_5_x/system-jmx/src/main/org/jboss/system/server/ServerImplMBean.java 2009-09-19 05:35:49 UTC (rev 93782)
+++ branches/Branch_5_x/system-jmx/src/main/org/jboss/system/server/ServerImplMBean.java 2009-09-19 05:49:08 UTC (rev 93783)
@@ -21,15 +21,15 @@
*/
package org.jboss.system.server;
-import org.jboss.bootstrap.spi.as.config.JBossASBasedServerConfig;
-import org.jboss.bootstrap.spi.as.server.JBossASBasedServer;
+import org.jboss.bootstrap.api.as.config.JBossASBasedServerConfig;
+import org.jboss.bootstrap.spi.as.server.JBossASBasedServerProvider;
/**
* MBean interface.
*/
-public interface ServerImplMBean<K extends JBossASBasedServer<K, T>, T extends JBossASBasedServerConfig<T>>
+public interface ServerImplMBean<K extends JBossASBasedServerProvider<K, T>, T extends JBossASBasedServerConfig<T>>
extends
- JBossASBasedServer<K, T>,
+ JBossASBasedServerProvider<K, T>,
ServerConstants
{
// Attributes ----------------------------------------------------
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-09-19 05:35:49 UTC (rev 93782)
+++ branches/Branch_5_x/system-jmx/src/main/org/jboss/system/server/jmx/JMXKernel.java 2009-09-19 05:49:08 UTC (rev 93783)
@@ -42,15 +42,15 @@
import javax.management.ObjectInstance;
import javax.management.ObjectName;
+import org.jboss.bootstrap.api.as.config.JBossASBasedServerConfig;
+import org.jboss.bootstrap.api.config.InvalidConfigurationException;
+import org.jboss.bootstrap.api.lifecycle.LifecycleEventException;
+import org.jboss.bootstrap.api.lifecycle.LifecycleEventHandler;
+import org.jboss.bootstrap.api.lifecycle.LifecycleState;
import org.jboss.bootstrap.spi.Bootstrap;
-import org.jboss.bootstrap.spi.as.config.JBossASBasedServerConfig;
-import org.jboss.bootstrap.spi.as.server.JBossASBasedServer;
+import org.jboss.bootstrap.spi.as.server.JBossASBasedServerProvider;
import org.jboss.bootstrap.spi.config.ConfigurationInitializer;
import org.jboss.bootstrap.spi.config.ConfigurationValidator;
-import org.jboss.bootstrap.spi.config.InvalidConfigurationException;
-import org.jboss.bootstrap.spi.lifecycle.LifecycleEventException;
-import org.jboss.bootstrap.spi.lifecycle.LifecycleEventHandler;
-import org.jboss.bootstrap.spi.lifecycle.LifecycleState;
import org.jboss.bootstrap.spi.server.ServerInitializer;
import org.jboss.classloader.spi.ClassLoaderSystem;
import org.jboss.classloading.spi.RealClassLoader;
@@ -81,7 +81,7 @@
* @author Scott.Stark at jboss.org
* @version $Revision$
*/
-public class JMXKernel<K extends JBossASBasedServer<K, T>, T extends JBossASBasedServerConfig<T>> extends JBossObject
+public class JMXKernel<K extends JBossASBasedServerProvider<K, T>, T extends JBossASBasedServerConfig<T>> extends JBossObject
implements JMXKernelMBean<K,T>, NotificationEmitter
{
private final static ObjectName DEFAULT_LOADER_NAME =
Modified: branches/Branch_5_x/system-jmx/src/main/org/jboss/system/server/jmx/JMXKernelMBean.java
===================================================================
--- branches/Branch_5_x/system-jmx/src/main/org/jboss/system/server/jmx/JMXKernelMBean.java 2009-09-19 05:35:49 UTC (rev 93782)
+++ branches/Branch_5_x/system-jmx/src/main/org/jboss/system/server/jmx/JMXKernelMBean.java 2009-09-19 05:49:08 UTC (rev 93783)
@@ -21,11 +21,11 @@
*/
package org.jboss.system.server.jmx;
-import org.jboss.bootstrap.spi.as.config.JBossASBasedServerConfig;
-import org.jboss.bootstrap.spi.as.server.JBossASBasedServer;
+import org.jboss.bootstrap.api.as.config.JBossASBasedServerConfig;
+import org.jboss.bootstrap.spi.as.server.JBossASBasedServerProvider;
import org.jboss.system.server.ServerImplMBean;
-public interface JMXKernelMBean<K extends JBossASBasedServer<K, T>, T extends JBossASBasedServerConfig<T>>
+public interface JMXKernelMBean<K extends JBossASBasedServerProvider<K, T>, T extends JBossASBasedServerConfig<T>>
extends
ServerImplMBean<K, T>
{
Modified: branches/Branch_5_x/system-jmx/src/main/org/jboss/system/server/jmx/LazyMBeanServer.java
===================================================================
--- branches/Branch_5_x/system-jmx/src/main/org/jboss/system/server/jmx/LazyMBeanServer.java 2009-09-19 05:35:49 UTC (rev 93782)
+++ branches/Branch_5_x/system-jmx/src/main/org/jboss/system/server/jmx/LazyMBeanServer.java 2009-09-19 05:49:08 UTC (rev 93783)
@@ -23,30 +23,31 @@
import java.io.ObjectInputStream;
import java.lang.reflect.Constructor;
+import java.util.Collections;
+import java.util.HashSet;
import java.util.Set;
-import java.util.HashSet;
-import java.util.Collections;
-import javax.management.MBeanServer;
-import javax.management.ObjectInstance;
-import javax.management.ObjectName;
-import javax.management.ReflectionException;
+
+import javax.management.Attribute;
+import javax.management.AttributeList;
+import javax.management.AttributeNotFoundException;
import javax.management.InstanceAlreadyExistsException;
-import javax.management.MBeanRegistrationException;
-import javax.management.MBeanException;
-import javax.management.NotCompliantMBeanException;
import javax.management.InstanceNotFoundException;
-import javax.management.QueryExp;
-import javax.management.AttributeNotFoundException;
-import javax.management.AttributeList;
-import javax.management.Attribute;
+import javax.management.IntrospectionException;
import javax.management.InvalidAttributeValueException;
-import javax.management.NotificationListener;
-import javax.management.NotificationFilter;
import javax.management.ListenerNotFoundException;
+import javax.management.MBeanException;
import javax.management.MBeanInfo;
-import javax.management.IntrospectionException;
+import javax.management.MBeanRegistrationException;
+import javax.management.MBeanServer;
+import javax.management.MBeanServerDelegate;
+import javax.management.NotCompliantMBeanException;
+import javax.management.NotificationFilter;
+import javax.management.NotificationListener;
+import javax.management.ObjectInstance;
+import javax.management.ObjectName;
import javax.management.OperationsException;
-import javax.management.MBeanServerDelegate;
+import javax.management.QueryExp;
+import javax.management.ReflectionException;
import javax.management.loading.ClassLoaderRepository;
/**
Modified: branches/Branch_5_x/system-jmx/src/main/org/jboss/system/server/jmx/MBeanServerBuilderImpl.java
===================================================================
--- branches/Branch_5_x/system-jmx/src/main/org/jboss/system/server/jmx/MBeanServerBuilderImpl.java 2009-09-19 05:35:49 UTC (rev 93782)
+++ branches/Branch_5_x/system-jmx/src/main/org/jboss/system/server/jmx/MBeanServerBuilderImpl.java 2009-09-19 05:49:08 UTC (rev 93783)
@@ -21,9 +21,9 @@
*/
package org.jboss.system.server.jmx;
+import javax.management.MBeanServer;
import javax.management.MBeanServerBuilder;
import javax.management.MBeanServerDelegate;
-import javax.management.MBeanServer;
/**
* An @link{MBeanServerBuilder} that creates a LazyMBeanServer instance to allow
Modified: branches/Branch_5_x/testsuite/.classpath
===================================================================
--- branches/Branch_5_x/testsuite/.classpath 2009-09-19 05:35:49 UTC (rev 93782)
+++ branches/Branch_5_x/testsuite/.classpath 2009-09-19 05:49:08 UTC (rev 93783)
@@ -60,5 +60,8 @@
<classpathentry kind="lib" path="/thirdparty/jboss/server/manager/lib/jboss-server-manager.jar" sourcepath="/thirdparty/jboss/server/manager/lib/jboss-server-manager-sources.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/jboss-ejb3-proxy-impl/lib/jboss-ejb3-proxy-impl.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/jboss-ejb3-proxy-spi/lib/jboss-ejb3-proxy-spi.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/jboss-bootstrap-api/lib/jboss-bootstrap-api.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/jboss-bootstrap-api-as/lib/jboss-bootstrap-api-as.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/jboss-bootstrap-api-mc/lib/jboss-bootstrap-api-mc.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-09-19 05:35:49 UTC (rev 93782)
+++ branches/Branch_5_x/testsuite/build.xml 2009-09-19 05:49:08 UTC (rev 93783)
@@ -253,6 +253,9 @@
<path refid="jboss.jboss.bootstrap.spi.as.classpath"/>
<path refid="jboss.jboss.bootstrap.spi.mc.classpath"/>
<path refid="jboss.jboss.bootstrap.spi.classpath"/>
+ <path refid="jboss.jboss.bootstrap.api.as.classpath"/>
+ <path refid="jboss.jboss.bootstrap.api.mc.classpath"/>
+ <path refid="jboss.jboss.bootstrap.api.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-09-19 05:35:49 UTC (rev 93782)
+++ branches/Branch_5_x/thirdparty/pom.xml 2009-09-19 05:49:08 UTC (rev 93783)
@@ -295,6 +295,27 @@
</dependency>
<dependency>
<groupId>org.jboss.bootstrap</groupId>
+ <artifactId>jboss-bootstrap-api</artifactId>
+ <mapping>
+ <componentId>jboss.jboss-bootstrap-api</componentId>
+ </mapping>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.bootstrap</groupId>
+ <artifactId>jboss-bootstrap-api-as</artifactId>
+ <mapping>
+ <componentId>jboss.jboss-bootstrap-api-as</componentId>
+ </mapping>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.bootstrap</groupId>
+ <artifactId>jboss-bootstrap-api-mc</artifactId>
+ <mapping>
+ <componentId>jboss.jboss-bootstrap-api-mc</componentId>
+ </mapping>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.bootstrap</groupId>
<artifactId>jboss-bootstrap-impl-as</artifactId>
<mapping>
<componentId>jboss.jboss-bootstrap-impl-as</componentId>
@@ -1392,6 +1413,18 @@
</dependency>
<dependency>
<groupId>org.jboss.bootstrap</groupId>
+ <artifactId>jboss-bootstrap-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.bootstrap</groupId>
+ <artifactId>jboss-bootstrap-api-as</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.bootstrap</groupId>
+ <artifactId>jboss-bootstrap-api-mc</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.bootstrap</groupId>
<artifactId>jboss-bootstrap-impl-as</artifactId>
</dependency>
<dependency>
Modified: branches/Branch_5_x/tomcat/.classpath
===================================================================
--- branches/Branch_5_x/tomcat/.classpath 2009-09-19 05:35:49 UTC (rev 93782)
+++ branches/Branch_5_x/tomcat/.classpath 2009-09-19 05:49:08 UTC (rev 93783)
@@ -32,5 +32,7 @@
<classpathentry kind="lib" path="/thirdparty/jboss/jboss-bootstrap-spi/lib/jboss-bootstrap-spi.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/jboss-bootstrap-spi-as/lib/jboss-bootstrap-spi-as.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/jboss-bootstrap-spi-mc/lib/jboss-bootstrap-spi-mc.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/jboss-bootstrap-api/lib/jboss-bootstrap-api.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/jboss-bootstrap-api-as/lib/jboss-bootstrap-api-as.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-09-19 05:35:49 UTC (rev 93782)
+++ branches/Branch_5_x/tomcat/build.xml 2009-09-19 05:49:08 UTC (rev 93783)
@@ -95,6 +95,9 @@
<path refid="jboss.jboss.bootstrap.spi.as.classpath"/>
<path refid="jboss.jboss.bootstrap.spi.mc.classpath"/>
<path refid="jboss.jboss.bootstrap.spi.classpath"/>
+ <path refid="jboss.jboss.bootstrap.api.as.classpath"/>
+ <path refid="jboss.jboss.bootstrap.api.mc.classpath"/>
+ <path refid="jboss.jboss.bootstrap.api.classpath"/>
<path refid="jboss.system.classpath"/>
<path refid="jboss.systemjmx.classpath"/>
<path refid="jboss.jboss.security.spi.classpath"/>
Modified: branches/Branch_5_x/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatService.java
===================================================================
--- branches/Branch_5_x/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatService.java 2009-09-19 05:35:49 UTC (rev 93782)
+++ branches/Branch_5_x/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatService.java 2009-09-19 05:49:08 UTC (rev 93783)
@@ -46,8 +46,8 @@
import org.apache.catalina.startup.CatalinaProperties;
import org.apache.tomcat.util.IntrospectionUtils;
import org.apache.tomcat.util.modeler.Registry;
-import org.jboss.bootstrap.spi.as.server.JBossASServer;
-import org.jboss.bootstrap.spi.lifecycle.LifecycleState;
+import org.jboss.bootstrap.api.lifecycle.LifecycleState;
+import org.jboss.bootstrap.spi.as.server.JBossASServerProvider;
import org.jboss.kernel.spi.dependency.KernelController;
import org.jboss.kernel.spi.dependency.KernelControllerContext;
import org.jboss.security.plugins.JaasSecurityManagerServiceMBean;
@@ -658,7 +658,7 @@
public void handleNotification(Notification msg, Object handback)
{
String type = msg.getType();
- if (type.equals(JBossASServer.START_NOTIFICATION_TYPE))
+ if (type.equals(JBossASServerProvider.START_NOTIFICATION_TYPE))
{
log.debug("Saw " + type + " notification, starting connectors");
try
@@ -670,7 +670,7 @@
log.warn("Failed to startConnectors", e);
}
}
- if (type.equals(JBossASServer.STOP_NOTIFICATION_TYPE))
+ if (type.equals(JBossASServerProvider.STOP_NOTIFICATION_TYPE))
{
log.debug("Saw " + type + " notification, stopping connectors");
try
Modified: branches/Branch_5_x/varia/.classpath
===================================================================
--- branches/Branch_5_x/varia/.classpath 2009-09-19 05:35:49 UTC (rev 93782)
+++ branches/Branch_5_x/varia/.classpath 2009-09-19 05:49:08 UTC (rev 93783)
@@ -27,5 +27,8 @@
<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-api/lib/jboss-bootstrap-api.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/jboss-bootstrap-api-as/lib/jboss-bootstrap-api-as.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/system"/>
<classpathentry kind="output" path="output/eclipse-classes"/>
</classpath>
Modified: branches/Branch_5_x/varia/build.xml
===================================================================
--- branches/Branch_5_x/varia/build.xml 2009-09-19 05:35:49 UTC (rev 93782)
+++ branches/Branch_5_x/varia/build.xml 2009-09-19 05:49:08 UTC (rev 93783)
@@ -120,6 +120,8 @@
<path refid="jboss.jboss.bootstrap.spi.as.classpath"/>
<path refid="jboss.jboss.bootstrap.spi.mc.classpath"/>
<path refid="jboss.jboss.bootstrap.spi.classpath"/>
+ <path refid="jboss.jboss.bootstrap.api.as.classpath"/>
+ <path refid="jboss.jboss.bootstrap.api.classpath"/>
<path refid="jboss.system.classpath"/>
<path refid="jboss.systemjmx.classpath"/>
<path refid="jboss.j2se.classpath"/>
Modified: branches/Branch_5_x/varia/src/main/org/jboss/jmx/adaptor/snmp/agent/SnmpAgentService.java
===================================================================
--- branches/Branch_5_x/varia/src/main/org/jboss/jmx/adaptor/snmp/agent/SnmpAgentService.java 2009-09-19 05:35:49 UTC (rev 93782)
+++ branches/Branch_5_x/varia/src/main/org/jboss/jmx/adaptor/snmp/agent/SnmpAgentService.java 2009-09-19 05:49:08 UTC (rev 93783)
@@ -25,7 +25,7 @@
import javax.management.Notification;
import javax.management.ObjectName;
-import org.jboss.bootstrap.spi.as.config.JBossASServerConfig;
+import org.jboss.bootstrap.api.as.config.JBossASServerConfig;
import org.jboss.system.ListenerServiceMBeanSupport;
import org.opennms.protocols.snmp.SnmpAgentSession;
import org.opennms.protocols.snmp.SnmpPeer;
Modified: branches/Branch_5_x/varia/src/main/org/jboss/jmx/adaptor/snmp/agent/TrapEmitter.java
===================================================================
--- branches/Branch_5_x/varia/src/main/org/jboss/jmx/adaptor/snmp/agent/TrapEmitter.java 2009-09-19 05:35:49 UTC (rev 93782)
+++ branches/Branch_5_x/varia/src/main/org/jboss/jmx/adaptor/snmp/agent/TrapEmitter.java 2009-09-19 05:49:08 UTC (rev 93783)
@@ -30,8 +30,8 @@
import javax.management.Notification;
+import org.jboss.bootstrap.api.as.config.JBossASServerConfig;
import org.jboss.bootstrap.spi.as.config.JBossASConfigurationInitializer;
-import org.jboss.bootstrap.spi.as.config.JBossASServerConfig;
import org.jboss.jmx.adaptor.snmp.config.manager.Manager;
import org.jboss.logging.Logger;
import org.jboss.xb.binding.MappingObjectModelFactory;
Modified: branches/Branch_5_x/varia/src/main/org/jboss/jmx/adaptor/snmp/trapd/TrapdService.java
===================================================================
--- branches/Branch_5_x/varia/src/main/org/jboss/jmx/adaptor/snmp/trapd/TrapdService.java 2009-09-19 05:35:49 UTC (rev 93782)
+++ branches/Branch_5_x/varia/src/main/org/jboss/jmx/adaptor/snmp/trapd/TrapdService.java 2009-09-19 05:49:08 UTC (rev 93783)
@@ -22,7 +22,7 @@
import java.net.InetAddress;
import java.net.UnknownHostException;
-import org.jboss.bootstrap.spi.as.config.JBossASServerConfig;
+import org.jboss.bootstrap.api.as.config.JBossASServerConfig;
import org.jboss.system.ServiceMBeanSupport;
import org.opennms.protocols.snmp.SnmpTrapSession;
Modified: branches/Branch_5_x/varia/src/main/org/jboss/services/binding/impl/Util.java
===================================================================
--- branches/Branch_5_x/varia/src/main/org/jboss/services/binding/impl/Util.java 2009-09-19 05:35:49 UTC (rev 93782)
+++ branches/Branch_5_x/varia/src/main/org/jboss/services/binding/impl/Util.java 2009-09-19 05:49:08 UTC (rev 93783)
@@ -33,7 +33,7 @@
import java.net.URL;
import java.net.URLConnection;
-import org.jboss.bootstrap.spi.as.config.JBossASServerConfig;
+import org.jboss.bootstrap.api.as.config.JBossASServerConfig;
import org.jboss.services.binding.ServiceBinding;
import org.jboss.services.binding.ServiceBindingValueSource;
Modified: branches/Branch_5_x/varia/src/main/org/jboss/services/deployment/LibraryManager.java
===================================================================
--- branches/Branch_5_x/varia/src/main/org/jboss/services/deployment/LibraryManager.java 2009-09-19 05:35:49 UTC (rev 93782)
+++ branches/Branch_5_x/varia/src/main/org/jboss/services/deployment/LibraryManager.java 2009-09-19 05:49:08 UTC (rev 93783)
@@ -26,7 +26,7 @@
import java.net.URISyntaxException;
import java.net.URL;
-import org.jboss.bootstrap.spi.as.config.JBossASServerConfig;
+import org.jboss.bootstrap.api.as.config.JBossASServerConfig;
import org.jboss.logging.Logger;
import org.jboss.system.server.ServerConfigLocator;
import org.jboss.util.file.Files;
Modified: branches/Branch_5_x/varia/src/main/org/jboss/varia/deployment/FoeDeployer.java
===================================================================
--- branches/Branch_5_x/varia/src/main/org/jboss/varia/deployment/FoeDeployer.java 2009-09-19 05:35:49 UTC (rev 93782)
+++ branches/Branch_5_x/varia/src/main/org/jboss/varia/deployment/FoeDeployer.java 2009-09-19 05:49:08 UTC (rev 93783)
@@ -44,7 +44,7 @@
import javax.management.MalformedObjectNameException;
import javax.management.ObjectName;
-import org.jboss.bootstrap.spi.as.config.JBossASServerConfig;
+import org.jboss.bootstrap.api.as.config.JBossASServerConfig;
import org.jboss.deployment.DeploymentException;
import org.jboss.deployment.DeploymentInfo;
import org.jboss.deployment.MainDeployerMBean;
More information about the jboss-cvs-commits
mailing list