modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatDiscoveryComponent.java
| 8 ++++++++
modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatServerOperationsDelegate.java
| 4 ++--
2 files changed, 10 insertions(+), 2 deletions(-)
New commits:
commit 884eb4f2a4a609ff9541d9d8693133f79518a520
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Wed Nov 23 15:26:04 2011 +0100
[BZ 690957] - EWS Tomcat is identical to "normal" tomcat when installed
through RPM (at least wrt system services installed)
Make sure that the operation execution logic doesn't get confused by not being
able to distinguish between them.
diff --git
a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatDiscoveryComponent.java
b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatDiscoveryComponent.java
index 7709b86..542f212 100644
---
a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatDiscoveryComponent.java
+++
b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatDiscoveryComponent.java
@@ -575,6 +575,14 @@ public class TomcatDiscoveryComponent implements
ResourceDiscoveryComponent, Man
return (isEWS(catalinaHome) && catalinaHome.endsWith(EWS_TOMCAT_6));
}
+ public static boolean isRPMTomcat5(String catalinaHome) {
+ return catalinaHome.endsWith(EWS_TOMCAT_5);
+ }
+
+ public static boolean isRPMTomcat6(String catalinaHome) {
+ return catalinaHome.endsWith(EWS_TOMCAT_6);
+ }
+
private void populateJMXConfiguration(Configuration configuration, String[]
commandLine) {
// null for manual add, properties will already be set
if (null == commandLine) {
diff --git
a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatServerOperationsDelegate.java
b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatServerOperationsDelegate.java
index ce542a9..f1e78f4 100644
---
a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatServerOperationsDelegate.java
+++
b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatServerOperationsDelegate.java
@@ -252,7 +252,7 @@ public class TomcatServerOperationsDelegate {
private ProcessExecution getRpmStart(Configuration pluginConfiguration) {
ProcessExecution processExecution;
String catalinaHome = this.serverComponent.getCatalinaHome().getPath();
- String rpm = TomcatDiscoveryComponent.isEWSTomcat6(catalinaHome) ?
TomcatDiscoveryComponent.EWS_TOMCAT_6
+ String rpm = TomcatDiscoveryComponent.isRPMTomcat6(catalinaHome) ?
TomcatDiscoveryComponent.EWS_TOMCAT_6
: TomcatDiscoveryComponent.EWS_TOMCAT_5;
processExecution = new ProcessExecution("service");
@@ -335,7 +335,7 @@ public class TomcatServerOperationsDelegate {
private ProcessExecution getRpmShutdown() {
ProcessExecution processExecution;
String catalinaHome = this.serverComponent.getCatalinaHome().getPath();
- String rpm = TomcatDiscoveryComponent.isEWSTomcat6(catalinaHome) ?
TomcatDiscoveryComponent.EWS_TOMCAT_6
+ String rpm = TomcatDiscoveryComponent.isRPMTomcat6(catalinaHome) ?
TomcatDiscoveryComponent.EWS_TOMCAT_6
: TomcatDiscoveryComponent.EWS_TOMCAT_5;
processExecution = new ProcessExecution("service");
Show replies by date