[jboss-cvs] JBossAS SVN: r101472 - in branches/vfs3-int: cluster/src/main/java/org/jboss/ha/framework/server/util and 9 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Feb 25 08:42:46 EST 2010
Author: johnbailey
Date: 2010-02-25 08:42:45 -0500 (Thu, 25 Feb 2010)
New Revision: 101472
Modified:
branches/vfs3-int/cluster/src/main/java/org/jboss/ha/framework/server/ClusterPartition.java
branches/vfs3-int/cluster/src/main/java/org/jboss/ha/framework/server/util/TopologyMonitorService.java
branches/vfs3-int/cluster/src/main/java/org/jboss/invocation/http/server/HttpProxyFactoryHA.java
branches/vfs3-int/main/src/main/java/org/jboss/Main.java
branches/vfs3-int/server/src/etc/deployers/core-naming-jboss-beans.xml
branches/vfs3-int/server/src/main/java/org/jboss/config/ServerConfigUtil.java
branches/vfs3-int/system-jmx/src/main/java/org/jboss/system/server/ServerConfigImpl.java
branches/vfs3-int/system-jmx/src/main/java/org/jboss/system/server/ServerImplMBean.java
branches/vfs3-int/system-jmx/src/main/java/org/jboss/system/server/jmx/JMXKernel.java
branches/vfs3-int/system-jmx/src/main/java/org/jboss/system/server/jmx/JMXKernelMBean.java
branches/vfs3-int/system/src/main/java/org/jboss/system/server/profileservice/ProfileServiceBootstrap.java
branches/vfs3-int/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/TomcatService.java
branches/vfs3-int/varia/src/main/java/org/jboss/invocation/http/servlet/InvokerServlet.java
Log:
Merged changes from trunk -r 101283:101436
Modified: branches/vfs3-int/cluster/src/main/java/org/jboss/ha/framework/server/ClusterPartition.java
===================================================================
--- branches/vfs3-int/cluster/src/main/java/org/jboss/ha/framework/server/ClusterPartition.java 2010-02-25 12:54:57 UTC (rev 101471)
+++ branches/vfs3-int/cluster/src/main/java/org/jboss/ha/framework/server/ClusterPartition.java 2010-02-25 13:42:45 UTC (rev 101472)
@@ -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: branches/vfs3-int/cluster/src/main/java/org/jboss/ha/framework/server/util/TopologyMonitorService.java
===================================================================
--- branches/vfs3-int/cluster/src/main/java/org/jboss/ha/framework/server/util/TopologyMonitorService.java 2010-02-25 12:54:57 UTC (rev 101471)
+++ branches/vfs3-int/cluster/src/main/java/org/jboss/ha/framework/server/util/TopologyMonitorService.java 2010-02-25 13:42:45 UTC (rev 101472)
@@ -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: branches/vfs3-int/cluster/src/main/java/org/jboss/invocation/http/server/HttpProxyFactoryHA.java
===================================================================
--- branches/vfs3-int/cluster/src/main/java/org/jboss/invocation/http/server/HttpProxyFactoryHA.java 2010-02-25 12:54:57 UTC (rev 101471)
+++ branches/vfs3-int/cluster/src/main/java/org/jboss/invocation/http/server/HttpProxyFactoryHA.java 2010-02-25 13:42:45 UTC (rev 101472)
@@ -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: branches/vfs3-int/main/src/main/java/org/jboss/Main.java
===================================================================
--- branches/vfs3-int/main/src/main/java/org/jboss/Main.java 2010-02-25 12:54:57 UTC (rev 101471)
+++ branches/vfs3-int/main/src/main/java/org/jboss/Main.java 2010-02-25 13:42:45 UTC (rev 101472)
@@ -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: branches/vfs3-int/server/src/etc/deployers/core-naming-jboss-beans.xml
===================================================================
--- branches/vfs3-int/server/src/etc/deployers/core-naming-jboss-beans.xml 2010-02-25 12:54:57 UTC (rev 101471)
+++ branches/vfs3-int/server/src/etc/deployers/core-naming-jboss-beans.xml 2010-02-25 13:42:45 UTC (rev 101472)
@@ -9,11 +9,9 @@
<!-- Install this bean as the global JVM NamingServer -->
<property name="installGlobalService">true</property>
<property name="useGlobalService">false</property>
- <!-- JBAS-7556: for the moment still done by NamingBeanImpl -->
- <!-- property name="installJavaComp">false</property -->
+ <property name="installJavaComp">false</property>
</bean>
- <!-- JBAS-7556: Weld has a hack which claims java:app, so disabled for now
<bean name="NameSpaces" class="org.jboss.reloaded.naming.service.NameSpaces"/>
<bean name="JavaEEModuleIdentifier" class="org.jboss.as.javaee.SimpleJavaEEModuleIdentifier"/>
@@ -33,5 +31,4 @@
<bean name="ComponentNamingDeployer" class="org.jboss.reloaded.naming.deployers.ComponentNamingDeployer">
<constructor><parameter><inject bean="NamingJavaEEComponentInformer"/></parameter></constructor>
</bean>
- -->
</deployment>
Modified: branches/vfs3-int/server/src/main/java/org/jboss/config/ServerConfigUtil.java
===================================================================
--- branches/vfs3-int/server/src/main/java/org/jboss/config/ServerConfigUtil.java 2010-02-25 12:54:57 UTC (rev 101471)
+++ branches/vfs3-int/server/src/main/java/org/jboss/config/ServerConfigUtil.java 2010-02-25 13:42:45 UTC (rev 101472)
@@ -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: branches/vfs3-int/system/src/main/java/org/jboss/system/server/profileservice/ProfileServiceBootstrap.java
===================================================================
--- branches/vfs3-int/system/src/main/java/org/jboss/system/server/profileservice/ProfileServiceBootstrap.java 2010-02-25 12:54:57 UTC (rev 101471)
+++ branches/vfs3-int/system/src/main/java/org/jboss/system/server/profileservice/ProfileServiceBootstrap.java 2010-02-25 13:42:45 UTC (rev 101472)
@@ -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: branches/vfs3-int/system-jmx/src/main/java/org/jboss/system/server/ServerConfigImpl.java
===================================================================
--- branches/vfs3-int/system-jmx/src/main/java/org/jboss/system/server/ServerConfigImpl.java 2010-02-25 12:54:57 UTC (rev 101471)
+++ branches/vfs3-int/system-jmx/src/main/java/org/jboss/system/server/ServerConfigImpl.java 2010-02-25 13:42:45 UTC (rev 101472)
@@ -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: branches/vfs3-int/system-jmx/src/main/java/org/jboss/system/server/ServerImplMBean.java
===================================================================
--- branches/vfs3-int/system-jmx/src/main/java/org/jboss/system/server/ServerImplMBean.java 2010-02-25 12:54:57 UTC (rev 101471)
+++ branches/vfs3-int/system-jmx/src/main/java/org/jboss/system/server/ServerImplMBean.java 2010-02-25 13:42:45 UTC (rev 101472)
@@ -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: branches/vfs3-int/system-jmx/src/main/java/org/jboss/system/server/jmx/JMXKernel.java
===================================================================
--- branches/vfs3-int/system-jmx/src/main/java/org/jboss/system/server/jmx/JMXKernel.java 2010-02-25 12:54:57 UTC (rev 101471)
+++ branches/vfs3-int/system-jmx/src/main/java/org/jboss/system/server/jmx/JMXKernel.java 2010-02-25 13:42:45 UTC (rev 101472)
@@ -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: branches/vfs3-int/system-jmx/src/main/java/org/jboss/system/server/jmx/JMXKernelMBean.java
===================================================================
--- branches/vfs3-int/system-jmx/src/main/java/org/jboss/system/server/jmx/JMXKernelMBean.java 2010-02-25 12:54:57 UTC (rev 101471)
+++ branches/vfs3-int/system-jmx/src/main/java/org/jboss/system/server/jmx/JMXKernelMBean.java 2010-02-25 13:42:45 UTC (rev 101472)
@@ -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: branches/vfs3-int/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/TomcatService.java
===================================================================
--- branches/vfs3-int/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/TomcatService.java 2010-02-25 12:54:57 UTC (rev 101471)
+++ branches/vfs3-int/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/TomcatService.java 2010-02-25 13:42:45 UTC (rev 101472)
@@ -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
Modified: branches/vfs3-int/varia/src/main/java/org/jboss/invocation/http/servlet/InvokerServlet.java
===================================================================
--- branches/vfs3-int/varia/src/main/java/org/jboss/invocation/http/servlet/InvokerServlet.java 2010-02-25 12:54:57 UTC (rev 101471)
+++ branches/vfs3-int/varia/src/main/java/org/jboss/invocation/http/servlet/InvokerServlet.java 2010-02-25 13:42:45 UTC (rev 101472)
@@ -186,19 +186,27 @@
between application and transport exceptions
*/
InvocationException appException = new InvocationException(t);
- log.debug("Invoke threw exception", t);
// Marshall the exception
if( returnValueAsAttribute == null || returnValueAsAttribute.booleanValue() == false )
{
- response.resetBuffer();
- MarshalledValue mv = new MarshalledValue(appException);
- ServletOutputStream sos = response.getOutputStream();
- ObjectOutputStream oos = new ObjectOutputStream(sos);
- oos.writeObject(mv);
- oos.close();
+ if (response.isCommitted())
+ {
+ // Cannot report back exception
+ log.error("Invoke threw exception, and response is already committed", t);
+ }
+ else
+ {
+ response.resetBuffer();
+ MarshalledValue mv = new MarshalledValue(appException);
+ ServletOutputStream sos = response.getOutputStream();
+ ObjectOutputStream oos = new ObjectOutputStream(sos);
+ oos.writeObject(mv);
+ oos.close();
+ }
}
else
{
+ log.debug("Invoke threw exception", t);
request.setAttribute("returnValue", appException);
}
}
More information about the jboss-cvs-commits
mailing list