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

mazz mazz at fedoraproject.org
Tue Aug 14 21:09:25 UTC 2012


 modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-server.sh                   |   13 ++++++++++
 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                   |    9 ++++--
 3 files changed, 20 insertions(+), 4 deletions(-)

New commits:
commit d81fbe90e9cb131189d6b5f43f32a67a8e35ad41
Author: John Mazzitelli <mazz at redhat.com>
Date:   Tue Aug 14 17:09:21 2012 -0400

    get the modules path setup for windows (I need to test this, have to make sure the syntax using ";" is correct)

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 bf75086..c72e861 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
@@ -52,7 +52,7 @@ wrapper.app.parameter.1=org.jboss.modules.Main
 
 # Additional command line arguments to be passed to the RHQ Server/JBossAS container (quotes ARE needed)
 wrapper.app.parameter.2=-mp
-wrapper.app.parameter.3="%RHQ_SERVER_HOME%/jbossas/modules"
+wrapper.app.parameter.3="%RHQ_SERVER_HOME%/modules;%RHQ_SERVER_HOME%/jbossas/modules"
 wrapper.app.parameter.4=-jaxpmodule
 wrapper.app.parameter.5=javax.xml.jaxp-provider
 wrapper.app.parameter.6=org.jboss.as.standalone


commit 4e5467182a71a1597d6a448d9a044c40fdd56d0e
Author: John Mazzitelli <mazz at redhat.com>
Date:   Tue Aug 14 17:05:10 2012 -0400

    put our own JbossAS modules in a separate, top level directory. This will help support running RHQ in a separately installed JBossAS container (like from an RPM install)

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 f4fb511..dafa5f0 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
@@ -324,6 +324,19 @@ debug_msg "RHQ_SERVER_ADDITIONAL_CMDLINE_OPTS: $RHQ_SERVER_ADDITIONAL_CMDLINE_OP
 _CMDLINE_OPTS="$RHQ_SERVER_CMDLINE_OPTS $RHQ_SERVER_ADDITIONAL_CMDLINE_OPTS"
 
 # ----------------------------------------------------------------------
+# We need to add our own modules to the core set of JBossAS modules.
+# JBOSS_MODULEPATH tells standalone.sh what to use.
+# ----------------------------------------------------------------------
+_RHQ_MODULES_PATH="${RHQ_SERVER_HOME}/modules"
+_INTERNAL_MODULES_PATH="${RHQ_SERVER_HOME}/jbossas/modules"
+if [ -n "$_CYGWIN" ]; then
+   _RHQ_MODULES_PATH=`cygpath --windows --path "$_RHQ_MODULES_PATH"`
+   _INTERNAL_MODULES_PATH=`cygpath --windows --path "$_INTERNAL_MODULES_PATH"`
+fi
+JBOSS_MODULEPATH="${_RHQ_MODULES_PATH}:${_INTERNAL_MODULES_PATH}"
+debug_msg "JBOSS_MODULEPATH: $JBOSS_MODULEPATH"
+
+# ----------------------------------------------------------------------
 # Now find the JBossAS standalone.sh script
 # ----------------------------------------------------------------------
 
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 50566a2..e6387a0 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
@@ -78,6 +78,10 @@
 
         <property name="jboss.deploy.dir" location="${jboss.home}/standalone/deployments" />
 
+        <!-- we will put our own JBossAS modules in our own location - this will augment JBossAS's own modules -->
+        <property name="jboss.modules.dir" location="${project.build.outputDirectory}/modules" />
+        <mkdir dir="${jboss.modules.dir}" />
+
         <condition property="use-postgres" value="true">
             <contains string="${rhq.server.database.type-mapping}" substring="postgres" casesensitive="false" />
         </condition>
@@ -159,7 +163,6 @@
               tofile="${jboss.home}/server/default/lib/rhq-container-lib-${rhq.version}.jar" verbose="true"/>
         -->
 
-        <property name="jboss.modules.dir" location="${jboss.home}/modules" />
         <echo>Adding JDBC modules to ${jboss.modules.dir} ...</echo>
         <copy file="${settings.localRepository}/com/oracle/ojdbc6/${ojdbc6.version}/ojdbc6-${ojdbc6.version}.jar"
               toDir="${jboss.modules.dir}/org/rhq/oracle/main" failonerror="false" verbose="true" />
@@ -303,10 +306,10 @@
         <antcall target="package-connectors" />
         <echo>Deploying RT filter jar ...</echo>
         <unzip src="${settings.localRepository}/org/rhq/helpers/rhq-rtfilter/${project.version}/rhq-rtfilter-${project.version}.zip" 
-               dest="${jboss.home}/modules" />
+               dest="${jboss.modules.dir}" />
 
         <unzip src="${settings.localRepository}/org/rhq/helpers/rhq-rtfilter-subsystem/${project.version}/rhq-rtfilter-subsystem-${project.version}.zip" 
-               dest="${jboss.home}/modules" />
+               dest="${jboss.modules.dir}" />
         <!-- TODO: it is up to either the installer or our EAR's WAR to use this so JON itself can have its RT data collected -->
 
     </target>




More information about the rhq-commits mailing list