[Hyperic-hq-discuss] hq r6833 - in trunk: . etc

[<cl...@hy...>]

Author: clee
Date: 2007-11-15 17:17:25 -0800 (Thu, 15 Nov 2007)
New Revision: 6833
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=6833

Modified:
   trunk/build.xml
   trunk/etc/shell-jar-excludes.txt
Log:
[SUPPORT-1130]
Fix shell export by including Hibernate libraries


Modified: trunk/build.xml
===================================================================
--- trunk/build.xml	2007-11-16 00:41:26 UTC (rev 6832)
+++ trunk/build.xml	2007-11-16 01:17:25 UTC (rev 6833)
@@ -38,7 +38,7 @@
   <!-- Thirdparty libs -->
   <property name="thirdparty.lib" location="thirdparty/lib"/>
   <property name="xdoclet.lib" location="${thirdparty.lib}/xdoclet"/>
-  <property name="hibernate_lib" location="${thirdparty.lib}/hibernate"/>
+  <property name="hibernate.lib" location="${thirdparty.lib}/hibernate"/>
 
   <property name="webapp.home" location="${hq.home}/web" />
   <property name="ear.dir" location="${build.dir}/hq.ear" />
@@ -84,7 +84,7 @@
     <fileset dir="${thirdparty.lib}/mysql_jdbc" includes="mysql*.jar"/>
     <fileset dir="${thirdparty.lib}/mx4j" includes="*.jar" />
     <fileset dir="${xdoclet.lib}" includes="*.jar" />
-    <fileset dir="${hibernate_lib}" includes="*.jar" />
+    <fileset dir="${hibernate.lib}" includes="*.jar" />
     <fileset dir="${jboss.home}/server/default/lib"
              includes="*.jar"
              excludes="antlr-*.jar,txsnatch.jar" />
@@ -446,7 +446,7 @@
       <fileset dir="${build.dir}/lib" >
         <include name="jxla.jar" />
       </fileset>
-      <fileset dir="${hibernate_lib}">
+      <fileset dir="${hibernate.lib}">
         <include name="antlr-2.7.6.jar" />
         <include name="asm-attrs.jar" />
         <include name="asm.jar" />
@@ -1328,6 +1328,15 @@
         <include name="xpp3_min-1.1.3.4.O.jar"/>
       </fileset>
 
+      <fileset dir="${hibernate.lib}" >
+        <include name="asm-attrs.jar"/>
+        <include name="asm.jar"/>
+        <include name="cglib-2.1.3.jar"/>
+        <include name="dom4j-1.6.1.jar"/>
+        <include name="hibernate3.jar"/>
+        <include name="hibernate-tools.jar"/>
+      </fileset>
+
       <fileset dir="${sigar.lib}" includes="*.*" />
       <fileset dir="${jboss.home}/client" includes="jbossall-client.jar"/>
         

Modified: trunk/etc/shell-jar-excludes.txt
===================================================================
--- trunk/etc/shell-jar-excludes.txt	2007-11-16 00:41:26 UTC (rev 6832)
+++ trunk/etc/shell-jar-excludes.txt	2007-11-16 01:17:25 UTC (rev 6833)
@@ -1,14 +1,15 @@
-net/hyperic/**/shared/*Local.class
-net/hyperic/**/shared/*LocalHome.class
+org/hyperic/**/shared/*Local.class
+org/hyperic/**/shared/*LocalHome.class
+org/hyperic/hq/**/*DAO.class
+org/hyperic/hq/**/*EJBImpl*.class
+org/hyperic/hq/agent/**
 org/hyperic/hq/common/shared/license/**
-org/hyperic/tools/license/**
-org/hyperic/hq/agent/**
 org/hyperic/hq/events/ext/**
 org/hyperic/hq/product/jmx/**
 org/hyperic/hq/product/logparse/**
 org/hyperic/hq/product/util/**
 org/hyperic/hq/ui/**
-net/hyperic/chart/**
+org/hyperic/chart/**
 org/hyperic/image/**
 org/hyperic/tools/**
 org/hyperic/util/cruisecontrol/**