modules/enterprise/server/appserver/pom.xml
| 5 +----
modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml
| 3 +--
modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Start.java
| 6 +-----
3 files changed, 3 insertions(+), 11 deletions(-)
New commits:
commit 42ca26e04cba93aa4e57e11cb43ea74eb7d7f35b
Author: John Sanda <jsanda(a)redhat.com>
Date: Tue Apr 30 12:59:24 2013 -0400
removing duplicate calls to chmod task in ant scripts
diff --git a/modules/enterprise/server/appserver/pom.xml
b/modules/enterprise/server/appserver/pom.xml
index be595d5..42aa4a5 100644
--- a/modules/enterprise/server/appserver/pom.xml
+++ b/modules/enterprise/server/appserver/pom.xml
@@ -271,12 +271,9 @@
<!-- Make sure shell scripts are readable and
executable. -->
<chmod perm="ug+x"
verbose="true">
- <fileset
dir="${deployment.dir}/bin" includes="*.sh" />
+ <fileset
dir="${deployment.dir}/bin" includes="*.sh,rhqctl" />
<fileset
dir="${deployment.dir}/jbossas/bin" includes="*.sh" />
</chmod>
-
- <!-- Adding explicitly the rhqctl script.
-->
- <chmod perm="ug+x"
verbose="true" file="${deployment.dir}/bin/rhqctl" />
</target>
</configuration>
<goals>
diff --git a/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml
b/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml
index 72a61c0..945e2c9 100644
--- a/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml
+++ b/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml
@@ -834,7 +834,6 @@ rhq.cassandra.logging.level=${rhq.cassandra.logging.level}
<echo>Make sure shell scripts are readable and executable.</echo>
<chmod dir="${project.build.outputDirectory}/bin"
includes="*.sh,rhqctl" perm="ug+x" verbose="true" />
<chmod dir="${jboss.home}/bin" includes="*.sh"
perm="ug+x" verbose="true" />
- <chmod file="${project.build.outputDirectory}/bin/rhqctl"
perm="ug+x" verbose="true" />
</target>
<target name="developer-release-message" if="predeploy">
commit 9763289df11a6813c6ff8594642d063723ec6060
Author: John Sanda <jsanda(a)redhat.com>
Date: Tue Apr 30 12:53:15 2013 -0400
fix start command for agent and make rhqctl script executable
diff --git a/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml
b/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml
index c84e597..72a61c0 100644
--- a/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml
+++ b/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml
@@ -832,7 +832,7 @@ rhq.cassandra.logging.level=${rhq.cassandra.logging.level}
<target name="fix-perms">
<echo>Make sure shell scripts are readable and executable.</echo>
- <chmod dir="${project.build.outputDirectory}/bin"
includes="*.sh" perm="ug+x" verbose="true" />
+ <chmod dir="${project.build.outputDirectory}/bin"
includes="*.sh,rhqctl" perm="ug+x" verbose="true" />
<chmod dir="${jboss.home}/bin" includes="*.sh"
perm="ug+x" verbose="true" />
<chmod file="${project.build.outputDirectory}/bin/rhqctl"
perm="ug+x" verbose="true" />
</target>
diff --git
a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Start.java
b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Start.java
index cfc104d..ef25370 100644
---
a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Start.java
+++
b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Start.java
@@ -188,11 +188,7 @@ public class Start extends ControlCommand {
log.debug("Failed to start agent service", e);
}
} else {
- String pid = getAgentPid();
-
- if (pid != null) {
- executor.execute(commandLine);
- }
+ executor.execute(commandLine);
}
}
Show replies by date