[rhq] Branch 'rhq-on-as7' - 2 commits - modules/core modules/enterprise
mazz
mazz at fedoraproject.org
Fri Aug 17 18:57:56 UTC 2012
modules/core/domain/src/main/resources/META-INF/ejb-jar.xml | 4 -
modules/enterprise/gui/coregui/src/main/webapp/WEB-INF/web.xml | 4 -
modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/ServerInformation.java | 5 +-
modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-server.sh | 23 +++++++---
modules/enterprise/server/ear/pom.xml | 1
modules/enterprise/server/jar/src/main/resources/META-INF/ejb-jar.xml | 4 -
6 files changed, 25 insertions(+), 16 deletions(-)
New commits:
commit 9bfacb977e8bce5228c7e027423cf807f8976eda
Author: John Mazzitelli <mazz at redhat.com>
Date: Fri Aug 17 14:57:51 2012 -0400
add "clean" option to rhq-server.sh - I'm seeing odd behavior trying to restart after deployments fail on previous starts. clean will remove all tmp and data directories so it starts fresh. it also removes log files
diff --git a/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-server.sh b/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-server.sh
index d15539f..95a42e9 100644
--- a/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-server.sh
+++ b/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-server.sh
@@ -63,8 +63,8 @@
# instead.
#
# RHQ_SERVER_ADDITIONAL_CMDLINE_OPTS - additional command line arguments to
-# be passed to the RHQ Server JBossAS
-# standalone.sh. This is added to
+# be passed to the RHQ Server JBossAS
+# standalone.sh. This is added to
# RHQ_SERVER_CMDLINE_OPTS; it is mainly
# used to augment the Server's default
# set of options. This can be left unset
@@ -257,7 +257,7 @@ fi
if [ -z "$RHQ_SERVER_JAVA_EXE_FILE_PATH" ]; then
if [ -z "$RHQ_SERVER_JAVA_HOME" ]; then
- RHQ_SERVER_JAVA_HOME="${RHQ_SERVER_HOME}/jre"
+ RHQ_SERVER_JAVA_HOME="${RHQ_SERVER_HOME}/jre"
if [ -d "$RHQ_SERVER_JAVA_HOME" ]; then
debug_msg "Using the embedded JRE"
else
@@ -318,7 +318,7 @@ if [ -z "$RHQ_SERVER_CMDLINE_OPTS" ]; then
_PROPS_FILE_PATH=`cygpath --windows --path "$_PROPS_FILE_PATH"`
fi
- RHQ_SERVER_CMDLINE_OPTS="-P ${_PROPS_FILE_PATH}"
+ RHQ_SERVER_CMDLINE_OPTS="-P ${_PROPS_FILE_PATH}"
fi
debug_msg "RHQ_SERVER_CMDLINE_OPTS: $RHQ_SERVER_CMDLINE_OPTS"
@@ -490,6 +490,19 @@ case "$1" in
exit 0
;;
+'clean')
+ if [ "$_SERVER_RUNNING" = "1" ]; then
+ echo "$_SERVER_STATUS"
+ echo "Please shutdown the server before cleaning."
+ exit 0
+ fi
+
+ echo "Cleaning data, tmp and log directories..."
+ rm -rf "${RHQ_SERVER_HOME}/jbossas/standalone/data"
+ rm -rf "${RHQ_SERVER_HOME}/jbossas/standalone/tmp"
+ rm -rf "${RHQ_SERVER_HOME}/logs"
+ ;;
+
'status')
echo "$_SERVER_STATUS"
echo "$_JVM_STATUS"
@@ -497,7 +510,7 @@ case "$1" in
;;
*)
- echo "Usage: $0 { start | stop | kill | status | console }"
+ echo "Usage: $0 { start | stop | kill | status | console | clean }"
exit 1
;;
esac
commit f0bc6f73f53ce91dcfed04ff08970138c473eeda
Author: John Mazzitelli <mazz at redhat.com>
Date: Fri Aug 17 14:57:10 2012 -0400
get the rest stuff to avoid spitting errors at deploy time
diff --git a/modules/core/domain/src/main/resources/META-INF/ejb-jar.xml b/modules/core/domain/src/main/resources/META-INF/ejb-jar.xml
index 686d7c2..349b479 100644
--- a/modules/core/domain/src/main/resources/META-INF/ejb-jar.xml
+++ b/modules/core/domain/src/main/resources/META-INF/ejb-jar.xml
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
-<ejb-jar version="3.0"
+<ejb-jar version="3.1"
xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd" />
+ http://java.sun.com/xml/ns/javaee/ejb-jar_3_1.xsd" />
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/WEB-INF/web.xml b/modules/enterprise/gui/coregui/src/main/webapp/WEB-INF/web.xml
index 418e37b..7983d61 100644
--- a/modules/enterprise/gui/coregui/src/main/webapp/WEB-INF/web.xml
+++ b/modules/enterprise/gui/coregui/src/main/webapp/WEB-INF/web.xml
@@ -193,10 +193,6 @@
<servlet-name>org.rhq.enterprise.gui.coregui.CoreGUI PlatformUtilizationGWTService</servlet-name>
<servlet-class>org.rhq.enterprise.gui.coregui.server.gwt.PlatformUtilizationGWTServiceImpl</servlet-class>
</servlet>
- <servlet>
- <servlet-name>ReportExporter</servlet-name>
- <servlet-class>org.rhq.enterprise.gui.coregui.server.reports.ReportExportServlet</servlet-class>
- </servlet>
<servlet>
<servlet-name>Resteasy</servlet-name>
diff --git a/modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/ServerInformation.java b/modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/ServerInformation.java
index fdfbc1a..94b1c81 100644
--- a/modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/ServerInformation.java
+++ b/modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/ServerInformation.java
@@ -815,8 +815,9 @@ public class ServerInformation {
Object mbean = MBeanServerInvocationHandler.newProxyInstance(mbs, name, XMLLoginConfigMBean.class, false);
XMLLoginConfigMBean conf = (XMLLoginConfigMBean) mbean;
- conf.stop();
- conf.start();
+ // DISABLING SINCE THIS INSTALLER-WAR MODULE ISN'T USED FOR AS7 ANYWAY
+ // conf.stop();
+ // conf.start();
}
public static class Server {
diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml
index 4fbd552..dc64e36 100644
--- a/modules/enterprise/server/ear/pom.xml
+++ b/modules/enterprise/server/ear/pom.xml
@@ -180,7 +180,6 @@
<groupId>org.freemarker</groupId>
<artifactId>freemarker</artifactId>
<version>${freemarker.version}</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
diff --git a/modules/enterprise/server/jar/src/main/resources/META-INF/ejb-jar.xml b/modules/enterprise/server/jar/src/main/resources/META-INF/ejb-jar.xml
index 8222948..d6e666e 100644
--- a/modules/enterprise/server/jar/src/main/resources/META-INF/ejb-jar.xml
+++ b/modules/enterprise/server/jar/src/main/resources/META-INF/ejb-jar.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<ejb-jar xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd"
- version="3.0">
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_1.xsd"
+ version="3.1">
<description>RHQ</description>
<display-name>RHQ</display-name>
More information about the rhq-commits
mailing list