Author: fhanik
Date: Fri Mar 9 07:46:20 2007
New Revision: 516438
URL: http://svn.apache.org/viewvc?view=rev&rev=516438
Log:
Took care of JMX error upon startup, component still not working, but at least
its not spitting out ugly messages
Added:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/deploy/mbeans-descriptors.xml
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/mbeans-descriptors.xml
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java?view=diff&rev=516438&r1=516437&r2=516438
==============================================================================
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java
Fri Mar 9 07:46:20 2007
@@ -149,15 +149,18 @@
// Check to correct engine and host setup
Object parent = getCluster().getContainer();
Engine engine = null;
+ String hostname = null;
if ( parent instanceof Host ) {
host = (Host) parent;
engine = (Engine) host.getParent();
+ hostname = host.getName();
}else {
engine = (Engine)parent;
+ hostname = engine.getDefaultHost();
}
try {
oname = new ObjectName(engine.getName() + ":type=Deployer,host="
- + host.getName());
+ + hostname);
} catch (Exception e) {
log.error("Can't construct MBean object name" + e);
}
Added:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/deploy/mbeans-descriptors.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/deploy/mbeans-descriptors.xml?view=auto&rev=516438
==============================================================================
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/deploy/mbeans-descriptors.xml
(added)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/deploy/mbeans-descriptors.xml
Fri Mar 9 07:46:20 2007
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<mbeans-descriptors>
+ <mbean
+ name="FarmWarDeployer"
+ className="org.apache.catalina.mbeans.ClassNameMBean"
+ description="Farm Deployer - Broken"
+ domain="Catalina"
+ group="Cluster"
+ type="org.apache.catalina.ha.deploy.FarmWarDeployer">
+ </mbean>
+</mbeans-descriptors>
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/mbeans-descriptors.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/mbeans-descriptors.xml?view=diff&rev=516438&r1=516437&r2=516438
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/mbeans-descriptors.xml
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/mbeans-descriptors.xml Fri
Mar 9 07:46:20 2007
@@ -8,10 +8,6 @@
group="Cluster"
type="org.apache.catalina.ha.tcp.SimpleTcpCluster">
- <attribute name="protocolStack"
- description="JavaGroups protocol stack selection"
- type="java.lang.String"/>
-
</mbean>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
