[Hyperic-hq-discuss] hq r9500 - in trunk: . bin etc

[<gv...@hy...>]

Author: gviedma
Date: 2008-05-13 13:23:11 -0700 (Tue, 13 May 2008)
New Revision: 9500
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=9500

Added:
   trunk/bin/hq-agent-master.bat
   trunk/bin/hq-agent-master.sh
   trunk/etc/rollback.properties
Modified:
   trunk/bin/hq-agent-wrapper.bat
   trunk/bin/hq-agent-wrapper.sh
   trunk/bin/hq-agent.sh
   trunk/build.xml
   trunk/etc/wrapper.conf
Log:
Changes to support new agent directory structure

Added: trunk/bin/hq-agent-master.bat
===================================================================
--- trunk/bin/hq-agent-master.bat	                        (rev 0)
+++ trunk/bin/hq-agent-master.bat	2008-05-13 20:23:11 UTC (rev 9500)
@@ -0,0 +1,28 @@
+@echo off
+setlocal
+
+if "%OS%"=="Windows_NT" goto nt
+echo This script only works with NT-based versions of Windows.
+goto :eof
+
+:nt
+rem
+rem Find the application home.
+rem
+rem %~dp0 is location of current script under NT
+set _AGENTHOME=%~dp0..\
+
+set ROLLBACK_PROPS=%_AGENTHOME%conf\rollback.properties
+set AGENT_BUNDLE_PROP=set.HQ_AGENT_BUNDLE
+
+rem look for the agent bundle property in the rollback properties file
+rem and invoke the bundle hq-agent.bat script
+for /F "delims== tokens=1*" %%i in (%ROLLBACK_PROPS%) do (
+  if "%%i"=="%AGENT_BUNDLE_PROP%" (
+    if not EXIST %_AGENTHOME%bundles\%%j\bin\hq-agent.bat (
+      echo Failed to find bundle script %_AGENTHOME%bundles\%%j\bin\hq-agent.bat.
+    ) else (
+      call %_AGENTHOME%bundles\%%j\bin\hq-agent.bat %*
+    )
+  )
+)

Added: trunk/bin/hq-agent-master.sh
===================================================================
--- trunk/bin/hq-agent-master.sh	                        (rev 0)
+++ trunk/bin/hq-agent-master.sh	2008-05-13 20:23:11 UTC (rev 9500)
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+# find the current path to master executable
+FINDNAME=$0 
+while [ -h $FINDNAME ] ; do FINDNAME=`ls -ld $FINDNAME | awk '{print $NF}'` ; done 
+RUNDIR=`echo $FINDNAME | sed -e 's@/[^/]*$@@'` 
+unset FINDNAME
+
+# cd to top level agent home
+if test -d $RUNDIR; then
+  cd $RUNDIR/..
+else
+  cd ..
+fi
+
+ROLLBACK_PROPERTIES=conf/rollback.properties
+PROP_NAME=set.HQ_AGENT_BUNDLE
+
+# resolve the HQ Agent Bundle property
+AGENT_BUNDLE=`grep $PROP_NAME $ROLLBACK_PROPERTIES | awk -F= '{print $2}'`
+
+if test -d "./bundles/$AGENT_BUNDLE"; then
+  # pass on the command to the bundle
+  #echo "Invoking agent bundle $AGENT_BUNDLE"
+  ./bundles/$AGENT_BUNDLE/bin/hq-agent.sh "$@"
+else
+  echo "Bundle $AGENT_BUNDLE does not exist!"
+fi


Property changes on: trunk/bin/hq-agent-master.sh
___________________________________________________________________
Name: svn:executable
   + *

Modified: trunk/bin/hq-agent-wrapper.bat
===================================================================
--- trunk/bin/hq-agent-wrapper.bat	2008-05-13 19:25:40 UTC (rev 9499)
+++ trunk/bin/hq-agent-wrapper.bat	2008-05-13 20:23:11 UTC (rev 9500)
@@ -39,7 +39,7 @@
 
 :gotjava
 rem Decide on the wrapper binary.
-set _WRAPPER_BASE=sbin\wrapper
+set _WRAPPER_BASE=..\..\wrapper\sbin\wrapper
 set _WRAPPER_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-x86-32.exe
 if exist "%_WRAPPER_EXE%" goto validate
 set _WRAPPER_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-x86-64.exe
@@ -114,15 +114,15 @@
 rem
 
 :ping
-"%JAVA_HOME%\bin\java" -Djava.compiler=NONE -Djava.security.auth.login.config=jaas.config -Dagent.mode=thread -Xmx256M -Xrs -Xmx128m -Djava.net.preferIPv4Stack=true -Djava.library.path="lib" -classpath "lib\AgentClient.jar;lib\AgentServer.jar;lib\lather.jar;pdk\lib\activation.jar;pdk\lib\ant.jar;pdk\lib\backport-util-concurrent.jar;pdk\lib\commons-beanutils.jar;pdk\lib\commons-codec-1.3.jar;pdk\lib\commons-collections.jar;pdk\lib\commons-httpclient-3.1.jar;pdk\lib\commons-logging.jar;pdk\lib\dnsjava-2.0.3.jar;pdk\lib\getopt.jar;pdk\lib\hq-product.jar;pdk\lib\hyperic-util.jar;pdk\lib\jakarta-oro-2.0.7.jar;pdk\lib\jdom_b8.jar;pdk\lib\jsch-0.1.34.jar;pdk\lib\json.jar;pdk\lib\junit.jar;pdk\lib\jxla.jar;pdk\lib\log4j-1.2.14.jar;pdk\lib\sigar.jar;pdk\lib\snmp4j.jar;pdk\lib\tomcat-jk.jar;pdk\lib\ws-commons-util-1.0.2.jar;pdk\lib\xalan.jar;pdk\lib\xml-apis.jar;pdk\lib\xmlrpc-client-3.1.jar;pdk\lib\xmlrpc-common-3.1.jar;pdk\lib\xpp3_min-1.1.3.4.O.jar;pdk\lib\xstream-1.2.1.jar" org.hy
 peric.hq.bizapp.agent.client.AgentClient ping
+"%JAVA_HOME%\bin\java" -Djava.compiler=NONE -Djava.security.auth.login.config=jaas.config -Dagent.mode=thread -Xmx256M -Xrs -Xmx128m -Djava.net.preferIPv4Stack=true -Djava.library.path="lib" -Dagent.propFile="../../conf/agent.properties" -Dagent.logDir="../../log" -classpath "lib\AgentClient.jar;lib\AgentServer.jar;lib\lather.jar;pdk\lib\activation.jar;pdk\lib\ant.jar;pdk\lib\backport-util-concurrent.jar;pdk\lib\commons-beanutils.jar;pdk\lib\commons-codec-1.3.jar;pdk\lib\commons-collections.jar;pdk\lib\commons-httpclient-3.1.jar;pdk\lib\commons-logging.jar;pdk\lib\dnsjava-2.0.3.jar;pdk\lib\getopt.jar;pdk\lib\hq-product.jar;pdk\lib\hyperic-util.jar;pdk\lib\jakarta-oro-2.0.7.jar;pdk\lib\jdom_b8.jar;pdk\lib\jsch-0.1.34.jar;pdk\lib\json.jar;pdk\lib\junit.jar;pdk\lib\jxla.jar;pdk\lib\log4j-1.2.14.jar;pdk\lib\sigar.jar;pdk\lib\snmp4j.jar;pdk\lib\tomcat-jk.jar;pdk\lib\ws-commons-util-1.0.2.jar;pdk\lib\xalan.jar;pdk\lib\xml-apis.jar;pdk\lib\xmlrpc-client-3.1.jar;pdk\lib\xmlrpc-commo
 n-3.1.jar;pdk\lib\xpp3_min-1.1.3.4.O.jar;pdk\lib\xstream-1.2.1.jar" org.hyperic.hq.bizapp.agent.client.AgentClient ping
 IF %ERRORLEVEL% NEQ 0 (echo Ping failed!) else echo Ping success!
 goto :eof
 
 :setup
-"%JAVA_HOME%\bin\java" -Djava.compiler=NONE -Djava.security.auth.login.config=jaas.config -Dagent.mode=thread -Xmx256M -Xrs -Xmx128m -Djava.net.preferIPv4Stack=true -Djava.library.path="lib" -classpath "lib\AgentClient.jar;lib\AgentServer.jar;lib\lather.jar;pdk\lib\activation.jar;pdk\lib\ant.jar;pdk\lib\backport-util-concurrent.jar;pdk\lib\commons-beanutils.jar;pdk\lib\commons-codec-1.3.jar;pdk\lib\commons-collections.jar;pdk\lib\commons-httpclient-3.1.jar;pdk\lib\commons-logging.jar;pdk\lib\dnsjava-2.0.3.jar;pdk\lib\getopt.jar;pdk\lib\hq-product.jar;pdk\lib\hyperic-util.jar;pdk\lib\jakarta-oro-2.0.7.jar;pdk\lib\jdom_b8.jar;pdk\lib\jsch-0.1.34.jar;pdk\lib\json.jar;pdk\lib\junit.jar;pdk\lib\jxla.jar;pdk\lib\log4j-1.2.14.jar;pdk\lib\sigar.jar;pdk\lib\snmp4j.jar;pdk\lib\tomcat-jk.jar;pdk\lib\ws-commons-util-1.0.2.jar;pdk\lib\xalan.jar;pdk\lib\xml-apis.jar;pdk\lib\xmlrpc-client-3.1.jar;pdk\lib\xmlrpc-common-3.1.jar;pdk\lib\xpp3_min-1.1.3.4.O.jar;pdk\lib\xstream-1.2.1.jar" org.hy
 peric.hq.bizapp.agent.client.AgentClient setup
+"%JAVA_HOME%\bin\java" -Djava.compiler=NONE -Djava.security.auth.login.config=jaas.config -Dagent.mode=thread -Xmx256M -Xrs -Xmx128m -Djava.net.preferIPv4Stack=true -Djava.library.path="lib" -Dagent.propFile="../../conf/agent.properties" -Dagent.logDir="../../log" -classpath "lib\AgentClient.jar;lib\AgentServer.jar;lib\lather.jar;pdk\lib\activation.jar;pdk\lib\ant.jar;pdk\lib\backport-util-concurrent.jar;pdk\lib\commons-beanutils.jar;pdk\lib\commons-codec-1.3.jar;pdk\lib\commons-collections.jar;pdk\lib\commons-httpclient-3.1.jar;pdk\lib\commons-logging.jar;pdk\lib\dnsjava-2.0.3.jar;pdk\lib\getopt.jar;pdk\lib\hq-product.jar;pdk\lib\hyperic-util.jar;pdk\lib\jakarta-oro-2.0.7.jar;pdk\lib\jdom_b8.jar;pdk\lib\jsch-0.1.34.jar;pdk\lib\json.jar;pdk\lib\junit.jar;pdk\lib\jxla.jar;pdk\lib\log4j-1.2.14.jar;pdk\lib\sigar.jar;pdk\lib\snmp4j.jar;pdk\lib\tomcat-jk.jar;pdk\lib\ws-commons-util-1.0.2.jar;pdk\lib\xalan.jar;pdk\lib\xml-apis.jar;pdk\lib\xmlrpc-client-3.1.jar;pdk\lib\xmlrpc-commo
 n-3.1.jar;pdk\lib\xpp3_min-1.1.3.4.O.jar;pdk\lib\xstream-1.2.1.jar" org.hyperic.hq.bizapp.agent.client.AgentClient setup
 goto :eof
 
 :setup-if-no-provider
-"%JAVA_HOME%\bin\java" -Djava.compiler=NONE -Djava.security.auth.login.config=jaas.config -Dagent.mode=thread -Xmx256M -Xrs -Xmx128m -Djava.net.preferIPv4Stack=true -Djava.library.path="lib" -classpath "lib\AgentClient.jar;lib\AgentServer.jar;lib\lather.jar;pdk\lib\activation.jar;pdk\lib\ant.jar;pdk\lib\backport-util-concurrent.jar;pdk\lib\commons-beanutils.jar;pdk\lib\commons-codec-1.3.jar;pdk\lib\commons-collections.jar;pdk\lib\commons-httpclient-3.1.jar;pdk\lib\commons-logging.jar;pdk\lib\dnsjava-2.0.3.jar;pdk\lib\getopt.jar;pdk\lib\hq-product.jar;pdk\lib\hyperic-util.jar;pdk\lib\jakarta-oro-2.0.7.jar;pdk\lib\jdom_b8.jar;pdk\lib\jsch-0.1.34.jar;pdk\lib\json.jar;pdk\lib\junit.jar;pdk\lib\jxla.jar;pdk\lib\log4j-1.2.14.jar;pdk\lib\sigar.jar;pdk\lib\snmp4j.jar;pdk\lib\tomcat-jk.jar;pdk\lib\ws-commons-util-1.0.2.jar;pdk\lib\xalan.jar;pdk\lib\xml-apis.jar;pdk\lib\xmlrpc-client-3.1.jar;pdk\lib\xmlrpc-common-3.1.jar;pdk\lib\xpp3_min-1.1.3.4.O.jar;pdk\lib\xstream-1.2.1.jar" org.hy
 peric.hq.bizapp.agent.client.AgentClient setup-if-no-provider
+"%JAVA_HOME%\bin\java" -Djava.compiler=NONE -Djava.security.auth.login.config=jaas.config -Dagent.mode=thread -Xmx256M -Xrs -Xmx128m -Djava.net.preferIPv4Stack=true -Djava.library.path="lib" -Dagent.propFile="../../conf/agent.properties" -Dagent.logDir="../../log" -classpath "lib\AgentClient.jar;lib\AgentServer.jar;lib\lather.jar;pdk\lib\activation.jar;pdk\lib\ant.jar;pdk\lib\backport-util-concurrent.jar;pdk\lib\commons-beanutils.jar;pdk\lib\commons-codec-1.3.jar;pdk\lib\commons-collections.jar;pdk\lib\commons-httpclient-3.1.jar;pdk\lib\commons-logging.jar;pdk\lib\dnsjava-2.0.3.jar;pdk\lib\getopt.jar;pdk\lib\hq-product.jar;pdk\lib\hyperic-util.jar;pdk\lib\jakarta-oro-2.0.7.jar;pdk\lib\jdom_b8.jar;pdk\lib\jsch-0.1.34.jar;pdk\lib\json.jar;pdk\lib\junit.jar;pdk\lib\jxla.jar;pdk\lib\log4j-1.2.14.jar;pdk\lib\sigar.jar;pdk\lib\snmp4j.jar;pdk\lib\tomcat-jk.jar;pdk\lib\ws-commons-util-1.0.2.jar;pdk\lib\xalan.jar;pdk\lib\xml-apis.jar;pdk\lib\xmlrpc-client-3.1.jar;pdk\lib\xmlrpc-commo
 n-3.1.jar;pdk\lib\xpp3_min-1.1.3.4.O.jar;pdk\lib\xstream-1.2.1.jar" org.hyperic.hq.bizapp.agent.client.AgentClient setup-if-no-provider
 goto :eof
 

Modified: trunk/bin/hq-agent-wrapper.sh
===================================================================
--- trunk/bin/hq-agent-wrapper.sh	2008-05-13 19:25:40 UTC (rev 9499)
+++ trunk/bin/hq-agent-wrapper.sh	2008-05-13 20:23:11 UTC (rev 9500)
@@ -15,7 +15,7 @@
 APP_LONG_NAME="HQ Agent"
 
 # Wrapper
-WRAPPER_CMD="sbin/wrapper"
+WRAPPER_CMD="../../wrapper/sbin/wrapper"
 WRAPPER_CONF="conf/wrapper.conf"
 
 # Priority at which to run the wrapper.  See "man nice" for valid priorities.
@@ -128,7 +128,9 @@
 # Begin HQ Agent specific logic
 # ------------- 
 AGENTPROPFILE_PROP=agent.propFile
-AGENT_PROPS=agent.properties
+AGENT_PROPS=../../conf/agent.properties
+AGENTLOGDIR_PROP=agent.logDir
+AGENTLOGDIR=../../log
 AGENT_LIB=./lib
 PDK_LIB=./pdk/lib
 # for /proc/net/tcp mirror
@@ -173,6 +175,7 @@
 CLIENT_CMD="${HQ_JAVA} \
     -Djava.net.preferIPv4Stack=true \
     -D${AGENTPROPFILE_PROP}=${AGENT_PROPS} \
+    -D${AGENTLOGDIR_PROP}=${AGENTLOGDIR} \
     -cp ${CLIENT_CLASSPATH} ${CLIENT_CLASS}"
 
 PING_CMD="${CLIENT_CMD} ping"

Modified: trunk/bin/hq-agent.sh
===================================================================
--- trunk/bin/hq-agent.sh	2008-05-13 19:25:40 UTC (rev 9499)
+++ trunk/bin/hq-agent.sh	2008-05-13 20:23:11 UTC (rev 9500)
@@ -1,7 +1,9 @@
 #!/bin/sh
 
 AGENTPROPFILE_PROP=agent.propFile
-AGENT_PROPS=agent.properties
+AGENT_PROPS=../../conf/agent.properties
+AGENTLOGDIR_PROP=agent.logDir
+AGENTLOGDIR=../../log
 AGENT_LIB=./lib
 PDK_LIB=./pdk/lib
 # for /proc/net/tcp mirror
@@ -67,6 +69,7 @@
 CLIENT_CMD="${HQ_JAVA} \
     -Djava.net.preferIPv4Stack=true \
     -D${AGENTPROPFILE_PROP}=${AGENT_PROPS} \
+    -D${AGENTLOGDIR_PROP}=${AGENTLOGDIR} \
     -cp ${CLIENT_CLASSPATH} ${CLIENT_CLASS}"
 
 START_CMD="${CLIENT_CMD} start"

Modified: trunk/build.xml
===================================================================
--- trunk/build.xml	2008-05-13 19:25:40 UTC (rev 9499)
+++ trunk/build.xml	2008-05-13 20:23:11 UTC (rev 9500)
@@ -16,6 +16,7 @@
 
   <!-- Version file -->
   <property name="version.properties" value="etc/version.properties"/>
+  <property file="${version.properties}" />
  
   <!-- ==================== Defaults ==================== -->
   <property name="jboss.home" location="${ENV.JBOSS_HOME}" />
@@ -52,10 +53,10 @@
   <property name="agent.dir" location="${build.dir}/agent" />
 
   <!-- PDK destination -->
-  <property name="pdk.dir" location="${agent.dir}/pdk" />
+  <property name="pdk.dir" location="${agent.dir}/bundles/agent-${version}/pdk" />
   <property name="pdk.lib" location="${pdk.dir}/lib" />
   <property name="pdk.plugins" location="${pdk.dir}/plugins" />
-  <property name="pdk.mibs" location="${agent.dir}/pdk/mibs" />
+  <property name="pdk.mibs" location="${pdk.dir}/mibs" />
   <property name="pdk.scripts" location="${pdk.dir}/scripts" />
   <property name="pdk.productStub"
             value="plugins/etc/ProductPluginXML.stub"/>
@@ -173,7 +174,7 @@
   <import file="${hq.home}/build_util/test-build.xml"/>
     
   <target name="init-props" unless="init-props.notrequired">
-     <property file="${version.properties}" />
+     <!--<property file="${version.properties}" />-->
      <property name="release.comment" value="Development Build"/>
      <property name="hq.isDev" value="true"/>
      <echo>${release.comment}, version: ${version}, build number: ${build}</echo>
@@ -1206,23 +1207,28 @@
 
   <target name="pack-agent" description="Pack the agent">
     <mkdir dir="${agent.dir}" />
-    <mkdir dir="${agent.dir}/lib" />
-    <mkdir dir="${agent.dir}/lib/handlers/lib" />	  
+    <mkdir dir="${agent.dir}/bin" />
     <mkdir dir="${agent.dir}/log" />
-    <mkdir dir="${agent.dir}/rcfiles" />
-    <mkdir dir="${agent.dir}/tmp" />
     <mkdir dir="${agent.dir}/conf" />
+    <mkdir dir="${agent.dir}/wrapper" />
+    <mkdir dir="${agent.dir}/wrapper/lib" />
+    <mkdir dir="${agent.dir}/wrapper/sbin" />
+    <mkdir dir="${agent.dir}/bundles/agent-${version}/lib" />
+    <mkdir dir="${agent.dir}/bundles/agent-${version}/lib/handlers/lib" />	 
+    <mkdir dir="${agent.dir}/bundles/agent-${version}/rcfiles" />
+    <mkdir dir="${agent.dir}/bundles/agent-${version}/tmp" />
+    <mkdir dir="${agent.dir}/bundles/agent-${version}/conf" />
 
     <!-- Touch the agent log file so that "smart" unzippers don't forget
          to create the log directory -->
     <touch file="${agent.dir}/log/agent.log"/>
-    <touch file="${agent.dir}/tmp/empty"/>
+    <touch file="${agent.dir}/bundles/agent-${version}/tmp/empty"/>
 
-    <copy todir="${agent.dir}/lib" >
+    <copy todir="${agent.dir}/bundles/agent-${version}/lib" >
       <fileset dir="${lather.lib}" includes="lather.jar" />
     </copy>
   	
-    <copy todir="${agent.dir}/lib/handlers/lib" >
+    <copy todir="${agent.dir}/bundles/agent-${version}/lib/handlers/lib" >
 		<fileset dir="${thirdparty.lib}">
 		  <include name="jboss-remoting.jar"/>
 		  <include name="jboss-common.jar"/>
@@ -1231,16 +1237,16 @@
 		<fileset dir="${thirdparty.lib}/hibernate" includes="concurrent*.jar"/>
     </copy>
 	  
-    <copy todir="${agent.dir}/sbin" >
+    <copy todir="${agent.dir}/wrapper/sbin" >
       <fileset dir="${wrapper.bin}" includes="*" />
     </copy> 	
   	
-    <copy todir="${agent.dir}/lib/boot" >
+    <copy todir="${agent.dir}/wrapper/lib" >
       <fileset dir="${wrapper.lib}" includes="*" />
     </copy> 	
 	  
     <!-- Autoinventory jars -->
-    <jar basedir="${build.dir}/classes" jarfile="${agent.dir}/lib/handlers/AgentAutoinventoryServer.jar">
+    <jar basedir="${build.dir}/classes" jarfile="${agent.dir}/bundles/agent-${version}/lib/handlers/AgentAutoinventoryServer.jar">
       <include name="org/hyperic/hq/autoinventory/**"/>
       <include name="org/hyperic/hq/authz/client/**"/>
       <include name="org/hyperic/hq/authz/shared/**"/>
@@ -1252,7 +1258,7 @@
     </jar>
 
     <!-- Bizapp jars -->
-    <jar basedir="${build.dir}/classes" jarfile="${agent.dir}/lib/handlers/AgentBizappServer.jar">
+    <jar basedir="${build.dir}/classes" jarfile="${agent.dir}/bundles/agent-${version}/lib/handlers/AgentBizappServer.jar">
       <include name="org/hyperic/hq/bizapp/agent/server/**"/>
       <include name="org/hyperic/hq/bizapp/agent/commands/**"/>
       <include name="org/hyperic/hq/bizapp/agent/*"/>
@@ -1262,7 +1268,7 @@
     </jar>
 
     <!-- Measurement jars -->
-    <jar basedir="${build.dir}/classes" jarfile="${agent.dir}/lib/handlers/AgentMeasurementServer.jar">
+    <jar basedir="${build.dir}/classes" jarfile="${agent.dir}/bundles/agent-${version}/lib/handlers/AgentMeasurementServer.jar">
         <include name="org/hyperic/hq/measurement/agent/**"/>
         <include name="org/hyperic/hq/measurement/ext/**"/>
         <include name="org/hyperic/hq/measurement/shared/**"/>
@@ -1278,7 +1284,7 @@
     </jar>
 	  
 	  <!-- New Handler for Transport -->
-    <jar basedir="${build.dir}/classes" jarfile="${agent.dir}/lib/handlers/lib/AgentTransport.jar">
+    <jar basedir="${build.dir}/classes" jarfile="${agent.dir}/bundles/agent-${version}/lib/handlers/lib/AgentTransport.jar">
 	  <include name="org/hyperic/hq/agent/server/AgentTransportLifecycleImpl.class"/> 	
       <include name="org/hyperic/hq/transport/AgentTransport*.class"/>
       <include name="org/hyperic/hq/transport/PollerClient.class"/>
@@ -1288,7 +1294,7 @@
     </jar>	  
 	  
     <!-- Top level stuff -->
-    <jar basedir="${build.dir}/classes" jarfile="${agent.dir}/lib/AgentServer.jar">
+    <jar basedir="${build.dir}/classes" jarfile="${agent.dir}/bundles/agent-${version}/lib/AgentServer.jar">
       <include name="org/hyperic/hq/agent/**"/>
       <include name="org/hyperic/hq/bizapp/agent/*.class"/>
       <include name="org/hyperic/hq/bizapp/client/*.class"/>
@@ -1301,7 +1307,7 @@
 
     <!-- Control agent server handler -->
     <jar basedir="${build.dir}/classes"
-         jarfile="${agent.dir}/lib/handlers/AgentControlServer.jar">
+         jarfile="${agent.dir}/bundles/agent-${version}/lib/handlers/AgentControlServer.jar">
       <include name="org/hyperic/hq/control/**"/>
       <exclude name="org/hyperic/hq/control/**/*_test.java"/>
       <manifest>
@@ -1310,14 +1316,14 @@
     </jar>
 
     <jar basedir="${build.dir}/classes"
-         jarfile="${agent.dir}/lib/handlers/LiveDataServer.jar">
+         jarfile="${agent.dir}/bundles/agent-${version}/lib/handlers/LiveDataServer.jar">
       <include name="org/hyperic/hq/livedata/**"/>
       <manifest>
         <attribute name="Main-Class" value="org.hyperic.hq.livedata.agent.server.LiveDataCommandsServer" />
       </manifest>
     </jar>
 
-    <jar basedir="${build.dir}/classes" jarfile="${agent.dir}/lib/AgentClient.jar">
+    <jar basedir="${build.dir}/classes" jarfile="${agent.dir}/bundles/agent-${version}/lib/AgentClient.jar">
       <exclude name="org/hyperic/hq/agent/server/**"/>
       <include name="org/hyperic/hq/agent/**"/>
       <include name="org/hyperic/hq/appdef/shared/*.class"/>
@@ -1331,31 +1337,43 @@
 
     <!-- TODO: Copy and replace properties -->
     <copy file="etc/agent.properties"
-        tofile="${agent.dir}/agent.properties"/>
+        tofile="${agent.dir}/conf/agent.properties"/>
+
     <copy file="bin/background.sh"
-        tofile="${agent.dir}/background.sh"/>
+        tofile="${agent.dir}/bundles/agent-${version}/background.sh"/>
     <copy file="bin/background.bat"
-        tofile="${agent.dir}/background.bat"/>
+        tofile="${agent.dir}/bundles/agent-${version}/background.bat"/>
     <copy file="etc/agent.jaas.config"
-        tofile="${agent.dir}/jaas.config"/>
+        tofile="${agent.dir}/bundles/agent-${version}/jaas.config"/>
     <copy file="bin/agent.rc"
-        tofile="${agent.dir}/rcfiles/agent.rc"/>
+        tofile="${agent.dir}/bundles/agent-${version}/rcfiles/agent.rc"/>
 
     <!-- DEPRECATED: replaced hq-agent.exe with Java Service Wrapper
     <copy file="${launcher.dir}/hq-agent.exe"
-        tofile="${agent.dir}/hq-agent.exe" />
+        tofile="${agent.dir}/bundles/agent-${version}/hq-agent.exe" />
     -->
+    <copy file="bin/hq-agent-master.sh"
+        tofile="${agent.dir}/bin/hq-agent.sh"/>  
+      <copy file="bin/hq-agent-master.bat"
+          tofile="${agent.dir}/bin/hq-agent.bat"/>  
+  	
     <copy file="bin/hq-agent.sh"
-        tofile="${agent.dir}/bin/hq-agent-nowrapper.sh"/>
-
+        tofile="${agent.dir}/bundles/agent-${version}/bin/hq-agent-nowrapper.sh"/>
+  	
     <copy file="bin/hq-agent-wrapper.bat"
-        tofile="${agent.dir}/bin/hq-agent.bat" />
+        tofile="${agent.dir}/bundles/agent-${version}/bin/hq-agent.bat" />
     <copy file="bin/hq-agent-wrapper.sh"
-        tofile="${agent.dir}/bin/hq-agent.sh"/> 	
+        tofile="${agent.dir}/bundles/agent-${version}/bin/hq-agent.sh"/> 	
   	
     <copy file="etc/wrapper.conf"
-        tofile="${agent.dir}/conf/wrapper.conf"/> 		
+        tofile="${agent.dir}/bundles/agent-${version}/conf/wrapper.conf"/> 		
   	
+    <copy file="etc/rollback.properties"
+        tofile="${agent.dir}/conf/rollback.properties"/>      	
+    <replace file="${agent.dir}/conf/rollback.properties">
+    	<replacefilter token="@@@VERSION@@@" value="${version}"/>
+    </replace>
+  	
     <antcall target="chmod-exec">
       <param name="chmod.dir" value="${agent.dir}"/>
     </antcall>

Copied: trunk/etc/rollback.properties (from rev 9430, trunk/etc/rollback.properties)
===================================================================
--- trunk/etc/rollback.properties	                        (rev 0)
+++ trunk/etc/rollback.properties	2008-05-13 20:23:11 UTC (rev 9500)
@@ -0,0 +1,4 @@
+# automatically generated upgrade rollback properties
+# do NOT edit manually!
+set.HQ_AGENT_BUNDLE=agent-@@@VERSION@@@
+set.HQ_AGENT_ROLLBACK_BUNDLE=agent-@@@VERSION@@@

Modified: trunk/etc/wrapper.conf
===================================================================
--- trunk/etc/wrapper.conf	2008-05-13 19:25:40 UTC (rev 9499)
+++ trunk/etc/wrapper.conf	2008-05-13 20:23:11 UTC (rev 9500)
@@ -1,10 +1,14 @@
 #********************************************************************
-# TestWrapper Properties
-#
-# NOTE - Please use src/conf/wrapper.conf.in as a template for your
-#        own application rather than the values used for the
-#        TestWrapper sample.
+# Java Service Wrapper Properties for Hyperic HQ Agent
 #********************************************************************
+# optional top level include config file to survive agent upgrades
+#include ../../conf/wrapper.conf
+# rollback configuration used in agent upgrades
+#include ../../conf/rollback.properties
+
+# instruct the wrapper to reload properties between JVM restarts
+wrapper.restart.reload_configuration=TRUE
+
 # default JAVA_HOME in case it is not already set
 set.default.JAVA_HOME=jre
 # Java Application
@@ -18,17 +22,17 @@
 
 # set top level directory as the working directory
 # (note that all relative paths below are relative to working directory)
-wrapper.working.dir=..
+wrapper.working.dir=../../bundles/%HQ_AGENT_BUNDLE%
 
 # Java Classpath (include wrapper.jar)  Add class path elements as
 #  needed starting from 1
 wrapper.java.classpath.1=lib/*.jar
 wrapper.java.classpath.2=pdk/lib/*.jar
-wrapper.java.classpath.3=lib/boot/*.jar
+wrapper.java.classpath.3=../../wrapper/lib/*.jar
 
 # Java Library Path (location of Wrapper.DLL or libwrapper.so)
 wrapper.java.library.path.1=%LD_LIBRARY_PATH%
-wrapper.java.library.path.2=lib/boot
+wrapper.java.library.path.2=../../wrapper/lib
 
 # Java Additional Parameters
 #wrapper.java.additional.1=
@@ -39,6 +43,8 @@
 wrapper.java.additional.5=-Xrs
 wrapper.java.additional.6=-Xmx128m
 wrapper.java.additional.7=-Djava.net.preferIPv4Stack=true
+wrapper.java.additional.8=-Dagent.logDir=../../log
+wrapper.java.additional.9=-Dagent.propFile=../../conf/agent.properties
 
 # Initial Java Heap Size (in MB)
 #wrapper.java.initmemory=3
@@ -74,7 +80,7 @@
 wrapper.console.loglevel=INFO
 
 # Log file to use for wrapper output logging.
-wrapper.logfile=log/wrapper.log
+wrapper.logfile=../../log/wrapper.log
 
 # Format of output for the log file.  (See docs for formats)
 wrapper.logfile.format=LPTM