[rhq] Branch 'rhq-on-as7' - modules/enterprise

mazz mazz at fedoraproject.org
Wed Aug 15 16:31:21 UTC 2012


 modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-server.sh                   |   10 +++++-
 modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/rhq-server-wrapper.conf |    2 -
 modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml                   |   16 +++++++---
 modules/enterprise/server/ear/pom.xml                                                          |    2 -
 4 files changed, 23 insertions(+), 7 deletions(-)

New commits:
commit 4326452d23c4026c3358b3d9cf0480e6886c103d
Author: John Mazzitelli <mazz at redhat.com>
Date:   Wed Aug 15 12:31:16 2012 -0400

    * enable AS7 debug logging when RHQ_SERVER_DEBUG env var is set
    * use the standalone-full.xml since that has hornet-q and things preconfigured
    * when using mvn -Pdev mode, set the auto-installer to run

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 dafa5f0..d15539f 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
@@ -287,9 +287,16 @@ export JAVA
 if [ -z "$RHQ_SERVER_JAVA_OPTS" ]; then
    RHQ_SERVER_JAVA_OPTS="-Xms1024M -Xmx1024M -XX:PermSize=256M -XX:MaxPermSize=256M -Djava.net.preferIPv4Stack=true -Dorg.jboss.resolver.warning=true -Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000"
 fi
+
+if [ -n "$RHQ_SERVER_DEBUG" ] && [ "$RHQ_SERVER_DEBUG" != "false" ]; then
+   _JBOSS_DEBUG_LOGGING="-Djboss.boot.server.log.level=DEBUG -Djboss.boot.server.log.console.level=DEBUG"
+else
+   _JBOSS_DEBUG_LOGGING=
+fi
+
 # Add the JVM opts that we always want to specify, whether or not the user set RHQ_SERVER_JAVA_OPTS.
 # Note that the double equals for the policy file specification IS INTENTIONAL
-RHQ_SERVER_JAVA_OPTS="-Dapp.name=rhq-server ${RHQ_SERVER_JAVA_OPTS} -Djboss.server.log.dir=${_LOG_DIR_PATH} -Djava.awt.headless=true -Dsun.lang.ClassLoader.allowArraySyntax=true -Djboss.server.default.config=standalone.xml -Djboss.modules.system.pkgs=org.jboss.byteman -Djava.security.manager -Djava.security.policy==${RHQ_SERVER_HOME}/bin/rhq-server.security-policy"
+RHQ_SERVER_JAVA_OPTS="-Dapp.name=rhq-server ${RHQ_SERVER_JAVA_OPTS} -Djboss.server.log.dir=${_LOG_DIR_PATH} -Djava.awt.headless=true -Dsun.lang.ClassLoader.allowArraySyntax=true -Djboss.server.default.config=standalone-full.xml -Djboss.modules.system.pkgs=org.jboss.byteman -Djava.security.manager -Djava.security.policy==${RHQ_SERVER_HOME}/bin/rhq-server.security-policy ${_JBOSS_DEBUG_LOGGING}"
 
 debug_msg "RHQ_SERVER_JAVA_OPTS: $RHQ_SERVER_JAVA_OPTS"
 debug_msg "RHQ_SERVER_ADDITIONAL_JAVA_OPTS: $RHQ_SERVER_ADDITIONAL_JAVA_OPTS"
@@ -334,6 +341,7 @@ if [ -n "$_CYGWIN" ]; then
    _INTERNAL_MODULES_PATH=`cygpath --windows --path "$_INTERNAL_MODULES_PATH"`
 fi
 JBOSS_MODULEPATH="${_RHQ_MODULES_PATH}:${_INTERNAL_MODULES_PATH}"
+export JBOSS_MODULEPATH
 debug_msg "JBOSS_MODULEPATH: $JBOSS_MODULEPATH"
 
 # ----------------------------------------------------------------------
diff --git a/modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/rhq-server-wrapper.conf b/modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/rhq-server-wrapper.conf
index c72e861..3780f90 100644
--- a/modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/rhq-server-wrapper.conf
+++ b/modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/rhq-server-wrapper.conf
@@ -74,7 +74,7 @@ wrapper.java.additional.10=-Dsun.rmi.dgc.client.gcInterval=3600000
 wrapper.java.additional.11=-Dsun.rmi.dgc.server.gcInterval=3600000
 wrapper.java.additional.12=-Djboss.modules.system.pkgs=org.jboss.byteman
 wrapper.java.additional.13=-Djava.awt.headless=true
-wrapper.java.additional.14=-Djboss.server.default.config=standalone.xml
+wrapper.java.additional.14=-Djboss.server.default.config=standalone-full.xml
 wrapper.java.additional.15="-Dorg.jboss.boot.log.file=%RHQ_SERVER_WRAPPER_LOG_DIR_PATH%/jbossas-boot.log"
 wrapper.java.additional.16="-Djboss.server.log.dir=%RHQ_SERVER_WRAPPER_LOG_DIR_PATH%"
 wrapper.java.additional.17="-Dlogging.configuration=file:%RHQ_SERVER_HOME%/jbossas/standalone/configuration/logging.properties"
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 eba51ff..093e3fe 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
@@ -127,6 +127,16 @@
             </not>
         </condition>
 
+        <!-- when predeploying, don't make people go to the installer - turn on the auto-installer -->
+        <condition property="rhq.autoinstall.enabled" value="true">
+            <equals arg1="${predeploy}" arg2="true" />
+        </condition>
+        <condition property="rhq.autoinstall.enabled" value="false">
+            <not>
+                <equals arg1="${predeploy}" arg2="true" />
+            </not>
+        </condition>
+
     </target>
 
     <target name="prepare-container"
@@ -206,7 +216,7 @@
         <delete>
             <fileset dir="${jboss.home}/standalone/configuration">
                 <include name="standalone-ha.xml" />
-                <include name="standalone-full.xml" />
+                <include name="standalone.xml" />
                 <include name="standalone-full-ha.xml" />
             </fileset>
         </delete>
@@ -502,7 +512,7 @@ rhq.sync.endpoint-address=false
 #                                          will use to talk to this server.
 #                                          If not set, a value to use is
 #                                          determined at auto-install time.
-rhq.autoinstall.enabled=false
+rhq.autoinstall.enabled=${rhq.autoinstall.enabled}
 rhq.autoinstall.database=auto
 rhq.autoinstall.public-endpoint-address=
 
@@ -569,8 +579,6 @@ rhq.autoinstall.public-endpoint-address=
 
     <target name="developer-release-message" if="predeploy">
         <echo>!!THIS IS A DEVELOPER CONTAINER BUILD - PRE-DEPLOYING RHQ SERVER!!</echo>
-        <!-- TODO I don't think we can skip the installer stage - but we can turn on auto-installation -->
-        <!-- So in here we should set rhq.autoinstall.enabled=true in rhq-server.properties --> 
     </target>
 
     <!-- TODO: when we ship with an embedded agent -->
diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml
index 8ca5eed..4fbd552 100644
--- a/modules/enterprise/server/ear/pom.xml
+++ b/modules/enterprise/server/ear/pom.xml
@@ -227,7 +227,7 @@
                     <unpackTypes>war,ejb</unpackTypes>
                     <archive>
                         <manifestEntries>
-                            <Dependencies>org.jboss.common-core</Dependencies> <!-- needed to fix https://issues.jboss.org/browse/AS7-5336 -->
+                            <Dependencies>org.jboss.common-core export</Dependencies> <!-- needed to fix https://issues.jboss.org/browse/AS7-5336 -->
                         </manifestEntries>
                     </archive>
                     <modules>




More information about the rhq-commits mailing list