[jboss-cvs] JBossAS SVN: r101358 - in trunk: cluster/src/main/java/org/jboss/ha/framework/server/util and 8 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Feb 23 18:29:43 EST 2010
Author: ALRubinger
Date: 2010-02-23 18:29:42 -0500 (Tue, 23 Feb 2010)
New Revision: 101358
Modified:
trunk/cluster/src/main/java/org/jboss/ha/framework/server/ClusterPartition.java
trunk/cluster/src/main/java/org/jboss/ha/framework/server/util/TopologyMonitorService.java
trunk/cluster/src/main/java/org/jboss/invocation/http/server/HttpProxyFactoryHA.java
trunk/component-matrix/pom.xml
trunk/main/src/main/java/org/jboss/Main.java
trunk/server/src/main/java/org/jboss/config/ServerConfigUtil.java
trunk/system-jmx/src/main/java/org/jboss/system/server/ServerConfigImpl.java
trunk/system-jmx/src/main/java/org/jboss/system/server/ServerImplMBean.java
trunk/system-jmx/src/main/java/org/jboss/system/server/jmx/JMXKernel.java
trunk/system-jmx/src/main/java/org/jboss/system/server/jmx/JMXKernelMBean.java
trunk/system/src/main/java/org/jboss/system/server/profileservice/ProfileServiceBootstrap.java
trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/TomcatService.java
Log:
[JBAS-7766] Upgrade to latest org.jboss.bootstrap
Modified: trunk/cluster/src/main/java/org/jboss/ha/framework/server/ClusterPartition.java
===================================================================
--- trunk/cluster/src/main/java/org/jboss/ha/framework/server/ClusterPartition.java 2010-02-23 23:24:43 UTC (rev 101357)
+++ trunk/cluster/src/main/java/org/jboss/ha/framework/server/ClusterPartition.java 2010-02-23 23:29:42 UTC (rev 101358)
@@ -50,7 +50,7 @@
import javax.naming.Reference;
import javax.naming.StringRefAddr;
-import org.jboss.bootstrap.spi.as.config.JBossASConfigurationInitializer;
+import org.jboss.bootstrap.spi.as.config.JBossASBasedConfigurationInitializer;
import org.jboss.ha.framework.interfaces.ClusterNode;
import org.jboss.ha.framework.interfaces.DistributedReplicantManager;
import org.jboss.ha.framework.interfaces.HAPartition;
@@ -205,7 +205,7 @@
private String cacheConfigName;
private ChannelFactory channelFactory;
private String stackName;
- private String partitionName = JBossASConfigurationInitializer.VALUE_PARTITION_NAME_DEFAULT;
+ private String partitionName = JBossASBasedConfigurationInitializer.VALUE_PARTITION_NAME_DEFAULT;
private long state_transfer_timeout=60000;
private long method_call_timeout=60000;
Modified: trunk/cluster/src/main/java/org/jboss/ha/framework/server/util/TopologyMonitorService.java
===================================================================
--- trunk/cluster/src/main/java/org/jboss/ha/framework/server/util/TopologyMonitorService.java 2010-02-23 23:24:43 UTC (rev 101357)
+++ trunk/cluster/src/main/java/org/jboss/ha/framework/server/util/TopologyMonitorService.java 2010-02-23 23:29:42 UTC (rev 101358)
@@ -30,7 +30,7 @@
import javax.naming.InitialContext;
import org.apache.log4j.MDC;
-import org.jboss.bootstrap.spi.as.config.JBossASConfigurationInitializer;
+import org.jboss.bootstrap.spi.as.config.JBossASBasedConfigurationInitializer;
import org.jboss.ha.framework.interfaces.HAPartition;
import org.jboss.ha.framework.interfaces.HAPartition.AsynchHAMembershipListener;
import org.jboss.ha.framework.server.HAPartitionLocator;
@@ -88,7 +88,7 @@
private static Logger changeLog = Logger.getLogger(CHANGE_NAME);
- private volatile String partitionName = JBossASConfigurationInitializer.VALUE_PARTITION_NAME_DEFAULT;
+ private volatile String partitionName = JBossASBasedConfigurationInitializer.VALUE_PARTITION_NAME_DEFAULT;
private volatile HAPartition partition;
Modified: trunk/cluster/src/main/java/org/jboss/invocation/http/server/HttpProxyFactoryHA.java
===================================================================
--- trunk/cluster/src/main/java/org/jboss/invocation/http/server/HttpProxyFactoryHA.java 2010-02-23 23:24:43 UTC (rev 101357)
+++ trunk/cluster/src/main/java/org/jboss/invocation/http/server/HttpProxyFactoryHA.java 2010-02-23 23:29:42 UTC (rev 101358)
@@ -29,7 +29,7 @@
import javax.management.MalformedObjectNameException;
import javax.management.ObjectName;
-import org.jboss.bootstrap.spi.as.config.JBossASConfigurationInitializer;
+import org.jboss.bootstrap.spi.as.config.JBossASBasedConfigurationInitializer;
import org.jboss.ha.framework.interfaces.HAPartition;
import org.jboss.ha.framework.interfaces.LoadBalancePolicy;
import org.jboss.ha.framework.server.HAPartitionLocator;
@@ -53,7 +53,7 @@
{
private ObjectName realJmxInvokerName;
private ObjectName wrappedJmxInvokerName;
- private String partitionName = JBossASConfigurationInitializer.VALUE_PARTITION_NAME_DEFAULT;
+ private String partitionName = JBossASBasedConfigurationInitializer.VALUE_PARTITION_NAME_DEFAULT;
private Class policyClass;
private HAInvokerWrapper invokerWrapper;
private HATarget invokerTarget;
Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml 2010-02-23 23:24:43 UTC (rev 101357)
+++ trunk/component-matrix/pom.xml 2010-02-23 23:29:42 UTC (rev 101358)
@@ -64,15 +64,7 @@
<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.aspects.transaction>1.0.0.GA</version.org.jboss.aspects.transaction>
- <version.org.jboss.bootstrap.api>2.0.0-alpha-2</version.org.jboss.bootstrap.api>
- <version.org.jboss.bootstrap.api.as>2.0.0-alpha-2</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.bootstrap>2.1.0-alpha-3</version.org.jboss.bootstrap>
<version.org.jboss.cache.core>3.2.1.GA</version.org.jboss.cache.core>
<version.org.jboss.cache.pojo>3.0.0.GA</version.org.jboss.cache.pojo>
<version.org.jboss.cl>2.2.0.Alpha2</version.org.jboss.cl>
@@ -2105,19 +2097,19 @@
<dependency>
<groupId>org.jboss.bootstrap</groupId>
<artifactId>jboss-bootstrap-api</artifactId>
- <version>${version.org.jboss.bootstrap.api}</version>
+ <version>${version.org.jboss.bootstrap}</version>
</dependency>
<dependency>
<groupId>org.jboss.bootstrap</groupId>
<artifactId>jboss-bootstrap-api-as</artifactId>
- <version>${version.org.jboss.bootstrap.api.as}</version>
+ <version>${version.org.jboss.bootstrap}</version>
</dependency>
<dependency>
<groupId>org.jboss.bootstrap</groupId>
<artifactId>jboss-bootstrap-api-mc</artifactId>
- <version>${version.org.jboss.bootstrap.api.mc}</version>
+ <version>${version.org.jboss.bootstrap}</version>
<exclusions>
<exclusion>
<groupId>org.jboss.microcontainer</groupId>
@@ -2129,19 +2121,19 @@
<dependency>
<groupId>org.jboss.bootstrap</groupId>
<artifactId>jboss-bootstrap-impl-as</artifactId>
- <version>${version.org.jboss.bootstrap.impl.as}</version>
+ <version>${version.org.jboss.bootstrap}</version>
</dependency>
<dependency>
<groupId>org.jboss.bootstrap</groupId>
<artifactId>jboss-bootstrap-impl-base</artifactId>
- <version>${version.org.jboss.bootstrap.impl.base}</version>
+ <version>${version.org.jboss.bootstrap}</version>
</dependency>
<dependency>
<groupId>org.jboss.bootstrap</groupId>
<artifactId>jboss-bootstrap-impl-mc</artifactId>
- <version>${version.org.jboss.bootstrap.impl.mc}</version>
+ <version>${version.org.jboss.bootstrap}</version>
<exclusions>
<exclusion>
<groupId>org.jboss.microcontainer</groupId>
@@ -2153,19 +2145,19 @@
<dependency>
<groupId>org.jboss.bootstrap</groupId>
<artifactId>jboss-bootstrap-spi</artifactId>
- <version>${version.org.jboss.bootstrap.spi}</version>
+ <version>${version.org.jboss.bootstrap}</version>
</dependency>
<dependency>
<groupId>org.jboss.bootstrap</groupId>
<artifactId>jboss-bootstrap-spi-as</artifactId>
- <version>${version.org.jboss.bootstrap.spi.as}</version>
+ <version>${version.org.jboss.bootstrap}</version>
</dependency>
<dependency>
<groupId>org.jboss.bootstrap</groupId>
<artifactId>jboss-bootstrap-spi-mc</artifactId>
- <version>${version.org.jboss.bootstrap.spi.mc}</version>
+ <version>${version.org.jboss.bootstrap}</version>
<exclusions>
<exclusion>
<groupId>org.jboss.microcontainer</groupId>
Modified: trunk/main/src/main/java/org/jboss/Main.java
===================================================================
--- trunk/main/src/main/java/org/jboss/Main.java 2010-02-23 23:24:43 UTC (rev 101357)
+++ trunk/main/src/main/java/org/jboss/Main.java 2010-02-23 23:29:42 UTC (rev 101358)
@@ -21,6 +21,9 @@
*/
package org.jboss;
+import gnu.getopt.Getopt;
+import gnu.getopt.LongOpt;
+
import java.io.Closeable;
import java.io.File;
import java.io.FilenameFilter;
@@ -39,13 +42,11 @@
import java.util.Properties;
import java.util.Set;
-import gnu.getopt.Getopt;
-import gnu.getopt.LongOpt;
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.JBossASBasedConfigurationInitializer;
/**
@@ -260,7 +261,7 @@
}
else
{
- libUrl = new URL(jbossHome, JBossASConfigurationInitializer.VALUE_LIBRARY_URL_SUFFIX_DEFAULT);
+ libUrl = new URL(jbossHome, JBossASBasedConfigurationInitializer.VALUE_LIBRARY_URL_SUFFIX_DEFAULT);
}
/*
@@ -271,7 +272,7 @@
String serverName = props.get(JBossASServerConfig.PROP_KEY_JBOSSAS_SERVER_NAME);
if (serverName == null || serverName.length() == 0)
{
- serverName = JBossASConfigurationInitializer.VALUE_SERVER_NAME_DEFAULT;
+ serverName = JBossASBasedConfigurationInitializer.VALUE_SERVER_NAME_DEFAULT;
}
final String manualBootLogDir = props.get(sysPropBootLogDir);
final String manualLogDir = props.get(sysPropLogDir);
@@ -798,7 +799,7 @@
{
try
{
- if (address == null || JBossASConfigurationInitializer.VALUE_BIND_ADDRESS_ANY.equals(address))
+ if (address == null || JBossASBasedConfigurationInitializer.VALUE_BIND_ADDRESS_ANY.equals(address))
return InetAddress.getLocalHost().getHostName();
}
catch (UnknownHostException ignored)
Modified: trunk/server/src/main/java/org/jboss/config/ServerConfigUtil.java
===================================================================
--- trunk/server/src/main/java/org/jboss/config/ServerConfigUtil.java 2010-02-23 23:24:43 UTC (rev 101357)
+++ trunk/server/src/main/java/org/jboss/config/ServerConfigUtil.java 2010-02-23 23:29:42 UTC (rev 101358)
@@ -25,7 +25,7 @@
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.JBossASBasedConfigurationInitializer;
/**
* ServerConfigUtil
@@ -56,7 +56,7 @@
public static String getSpecificBindAddress()
{
String address = System.getProperty(JBossASServerConfig.PROP_KEY_JBOSSAS_BIND_ADDRESS);
- if (address == null || address.equals(JBossASConfigurationInitializer.VALUE_BIND_ADDRESS_ANY))
+ if (address == null || address.equals(JBossASBasedConfigurationInitializer.VALUE_BIND_ADDRESS_ANY))
return null;
return address;
}
@@ -74,7 +74,7 @@
try
{
if (address == null
- || InetAddress.getByName(JBossASConfigurationInitializer.VALUE_BIND_ADDRESS_ANY).equals(address))
+ || InetAddress.getByName(JBossASBasedConfigurationInitializer.VALUE_BIND_ADDRESS_ANY).equals(address))
return InetAddress.getLocalHost();
}
catch (UnknownHostException ignored)
@@ -95,7 +95,7 @@
{
try
{
- if (address == null || JBossASConfigurationInitializer.VALUE_BIND_ADDRESS_ANY.equals(address))
+ if (address == null || JBossASBasedConfigurationInitializer.VALUE_BIND_ADDRESS_ANY.equals(address))
return InetAddress.getLocalHost().getHostName();
}
catch (UnknownHostException ignored)
Modified: trunk/system/src/main/java/org/jboss/system/server/profileservice/ProfileServiceBootstrap.java
===================================================================
--- trunk/system/src/main/java/org/jboss/system/server/profileservice/ProfileServiceBootstrap.java 2010-02-23 23:24:43 UTC (rev 101357)
+++ trunk/system/src/main/java/org/jboss/system/server/profileservice/ProfileServiceBootstrap.java 2010-02-23 23:29:42 UTC (rev 101358)
@@ -36,11 +36,8 @@
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.api.as.config.JBossASServerConfig;
-import org.jboss.bootstrap.api.server.Server;
import org.jboss.bootstrap.spi.as.JBossASBootstrap;
-import org.jboss.bootstrap.spi.as.server.JBossASBasedServerProvider;
-import org.jboss.bootstrap.spi.as.server.JBossASServerProvider;
+import org.jboss.bootstrap.spi.as.server.MCJBossASBasedServerProvider;
import org.jboss.dependency.spi.ControllerContext;
import org.jboss.dependency.spi.ControllerState;
import org.jboss.deployers.client.spi.IncompleteDeploymentException;
@@ -97,7 +94,7 @@
* @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
* @version $Revision$
*/
-public class ProfileServiceBootstrap<K extends JBossASBasedServerProvider<K, T>, T extends JBossASBasedServerConfig<T>>
+public class ProfileServiceBootstrap<K extends MCJBossASBasedServerProvider<K, T>, T extends JBossASBasedServerConfig<T>>
implements JBossASBootstrap<K,T>, KernelRegistryPlugin
{
/** The log */
Modified: trunk/system-jmx/src/main/java/org/jboss/system/server/ServerConfigImpl.java
===================================================================
--- trunk/system-jmx/src/main/java/org/jboss/system/server/ServerConfigImpl.java 2010-02-23 23:24:43 UTC (rev 101357)
+++ trunk/system-jmx/src/main/java/org/jboss/system/server/ServerConfigImpl.java 2010-02-23 23:29:42 UTC (rev 101358)
@@ -22,10 +22,12 @@
package org.jboss.system.server;
import java.net.URL;
+import java.util.List;
import java.util.Map;
import java.util.Properties;
import org.jboss.bootstrap.api.as.config.JBossASBasedServerConfig;
+import org.jboss.bootstrap.api.descriptor.BootstrapDescriptor;
/**
* An mbean wrapper for the BaseServerConfig that exposes the config as the
@@ -428,6 +430,11 @@
return this.covarientReturn();
}
+ public List<BootstrapDescriptor> getBootstrapDescriptors()
+ {
+ return config.getBootstrapDescriptors();
+ }
+
/**
* Returns this reference represented as T
* @return
Modified: trunk/system-jmx/src/main/java/org/jboss/system/server/ServerImplMBean.java
===================================================================
--- trunk/system-jmx/src/main/java/org/jboss/system/server/ServerImplMBean.java 2010-02-23 23:24:43 UTC (rev 101357)
+++ trunk/system-jmx/src/main/java/org/jboss/system/server/ServerImplMBean.java 2010-02-23 23:29:42 UTC (rev 101358)
@@ -22,14 +22,14 @@
package org.jboss.system.server;
import org.jboss.bootstrap.api.as.config.JBossASBasedServerConfig;
-import org.jboss.bootstrap.spi.as.server.JBossASBasedServerProvider;
+import org.jboss.bootstrap.spi.as.server.MCJBossASBasedServerProvider;
/**
* MBean interface.
*/
-public interface ServerImplMBean<K extends JBossASBasedServerProvider<K, T>, T extends JBossASBasedServerConfig<T>>
+public interface ServerImplMBean<K extends MCJBossASBasedServerProvider<K, T>, T extends JBossASBasedServerConfig<T>>
extends
- JBossASBasedServerProvider<K, T>,
+ MCJBossASBasedServerProvider<K, T>,
ServerConstants
{
// Attributes ----------------------------------------------------
Modified: trunk/system-jmx/src/main/java/org/jboss/system/server/jmx/JMXKernel.java
===================================================================
--- trunk/system-jmx/src/main/java/org/jboss/system/server/jmx/JMXKernel.java 2010-02-23 23:24:43 UTC (rev 101357)
+++ trunk/system-jmx/src/main/java/org/jboss/system/server/jmx/JMXKernel.java 2010-02-23 23:29:42 UTC (rev 101358)
@@ -47,7 +47,7 @@
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.server.JBossASBasedServerProvider;
+import org.jboss.bootstrap.spi.as.server.MCJBossASBasedServerProvider;
import org.jboss.bootstrap.spi.config.ConfigurationInitializer;
import org.jboss.bootstrap.spi.config.ConfigurationValidator;
import org.jboss.bootstrap.spi.server.ServerInitializer;
@@ -81,7 +81,7 @@
* @author Scott.Stark at jboss.org
* @version $Revision$
*/
-public class JMXKernel<K extends JBossASBasedServerProvider<K, T>, T extends JBossASBasedServerConfig<T>> extends JBossObject
+public class JMXKernel<K extends MCJBossASBasedServerProvider<K, T>, T extends JBossASBasedServerConfig<T>> extends JBossObject
implements JMXKernelMBean<K,T>, NotificationEmitter
{
private final static ObjectName DEFAULT_LOADER_NAME =
Modified: trunk/system-jmx/src/main/java/org/jboss/system/server/jmx/JMXKernelMBean.java
===================================================================
--- trunk/system-jmx/src/main/java/org/jboss/system/server/jmx/JMXKernelMBean.java 2010-02-23 23:24:43 UTC (rev 101357)
+++ trunk/system-jmx/src/main/java/org/jboss/system/server/jmx/JMXKernelMBean.java 2010-02-23 23:29:42 UTC (rev 101358)
@@ -22,10 +22,10 @@
package org.jboss.system.server.jmx;
import org.jboss.bootstrap.api.as.config.JBossASBasedServerConfig;
-import org.jboss.bootstrap.spi.as.server.JBossASBasedServerProvider;
+import org.jboss.bootstrap.spi.as.server.MCJBossASBasedServerProvider;
import org.jboss.system.server.ServerImplMBean;
-public interface JMXKernelMBean<K extends JBossASBasedServerProvider<K, T>, T extends JBossASBasedServerConfig<T>>
+public interface JMXKernelMBean<K extends MCJBossASBasedServerProvider<K, T>, T extends JBossASBasedServerConfig<T>>
extends
ServerImplMBean<K, T>
{
Modified: trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/TomcatService.java
===================================================================
--- trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/TomcatService.java 2010-02-23 23:24:43 UTC (rev 101357)
+++ trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/TomcatService.java 2010-02-23 23:29:42 UTC (rev 101358)
@@ -47,7 +47,7 @@
import org.apache.tomcat.util.IntrospectionUtils;
import org.apache.tomcat.util.modeler.Registry;
import org.jboss.bootstrap.api.lifecycle.LifecycleState;
-import org.jboss.bootstrap.spi.as.server.JBossASServerProvider;
+import org.jboss.bootstrap.spi.as.server.MCJBossASServerProvider;
import org.jboss.kernel.spi.dependency.KernelController;
import org.jboss.kernel.spi.dependency.KernelControllerContext;
import org.jboss.security.plugins.JaasSecurityManagerServiceMBean;
@@ -644,7 +644,7 @@
public void handleNotification(Notification msg, Object handback)
{
String type = msg.getType();
- if (type.equals(JBossASServerProvider.START_NOTIFICATION_TYPE))
+ if (type.equals(MCJBossASServerProvider.START_NOTIFICATION_TYPE))
{
log.debug("Saw " + type + " notification, starting connectors");
try
@@ -656,7 +656,7 @@
log.warn("Failed to startConnectors", e);
}
}
- if (type.equals(JBossASServerProvider.STOP_NOTIFICATION_TYPE))
+ if (type.equals(MCJBossASServerProvider.STOP_NOTIFICATION_TYPE))
{
log.debug("Saw " + type + " notification, stopping connectors");
try
More information about the jboss-cvs-commits
mailing list