From a69d6bc0897e94518f3f65fd8b6cdd1bf02fb27a Mon Sep 17 00:00:00 2001
From: Mice Xia <mice_xia@tcloudcomputing.com>
Date: Mon, 10 Sep 2012 23:33:11 +0800
Subject: [PATCH] part of CLOUDSTACK-69 remove hibernate and its dependency
 from wscript_build and cloud.spec

---
 cloud.spec    | 3 +--
 wscript_build | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/cloud.spec b/cloud.spec
index e92fa6e9081..53bafa1870c 100644
--- a/cloud.spec
+++ b/cloud.spec
@@ -467,12 +467,11 @@ fi
 %{_javadir}/mail-1.4.jar
 %{_javadir}/activation-1.1.jar
 %{_javadir}/mysql-connector-java-5.1.21.jar
-%{_javadir}/asm-3.1.jar
 %{_javadir}/xapi-5.6.100-1-SNAPSHOT.jar
 %{_javadir}/log4j-*.jar
 %{_javadir}/apache-log4j-extras-1.1.jar
 %{_javadir}/trilead-ssh2-build213-svnkit-1.3-patch.jar
-%{_javadir}/cglib-2.2.jar
+%{_javadir}/cglib-nodep-2.2.2.jar
 %{_javadir}/xmlrpc-common-3.*.jar
 %{_javadir}/xmlrpc-client-3.*.jar
 %{_javadir}/wsdl4j-1.6.2.jar
diff --git a/wscript_build b/wscript_build
index d8c9137a978..ceb7b890645 100644
--- a/wscript_build
+++ b/wscript_build
@@ -163,8 +163,8 @@ def build_dependences ():
 	start_path = bld.path.find_dir ("deps")
 
         bld.install_files('${JAVADIR}',start_path.ant_glob(["apache-log4j-extras-1.1.jar", "libvirt-0.4.8.jar", "axis2-1.5.1.jar", "jstl-1.2.jar", "commons-discovery-0.5.jar", "commons-codec-1.6.jar", "ejb-api-3.0.jar", "xmlrpc-client-3.1.3.jar", "commons-dbcp-1.4.jar", "commons-pool-1.6.jar", "gson-1.7.1.jar", 
-         "netscaler-1.0.jar", "netscaler-sdx-1.0.jar", "backport-util-concurrent-3.1.jar", "ehcache-1.5.0.jar", "httpcore-4.0.jar", "log4j-1.2.16.jar", "trilead-ssh2-build213-svnkit-1.3-patch.jar", "cglib-2.2.jar", "xmlrpc-common-3.*.jar", 
-         "xmlrpc-client-3.*.jar", "axis-1.4.jar", "wsdl4j-1.6.2.jar", "bcprov-jdk16-1.46.jar", "jsch-0.1.42.jar", "jasypt-1.9.0.jar", "commons-configuration-1.8.jar", "commons-lang-2.6.jar",  "mail-1.4.jar", "activation-1.1.jar", "mysql-connector-java-5.1.21.jar", "hibernate-jpa-2.0-api-1.0.0.Final.jar", "hibernate-entitymanager-3.5.1-Final.jar", "hibernate-core-3.5.1-Final.jar", "hibernate-commons-annotations-3.2.0.Final.jar", "hibernate-annotations-3.5.1-Final.jar", "asm-3.1.jar", "xapi-5.6.100-1-SNAPSHOT.jar"], excl = excludes), cwd=start_path)
+         "netscaler-1.0.jar", "netscaler-sdx-1.0.jar", "backport-util-concurrent-3.1.jar", "ehcache-1.5.0.jar", "httpcore-4.0.jar", "log4j-1.2.16.jar", "trilead-ssh2-build213-svnkit-1.3-patch.jar", "cglib-nodep-2.2.2.jar", "xmlrpc-common-3.*.jar", 
+         "xmlrpc-client-3.*.jar", "axis-1.4.jar", "wsdl4j-1.6.2.jar", "bcprov-jdk16-1.46.jar", "jsch-0.1.42.jar", "jasypt-1.9.0.jar", "commons-configuration-1.8.jar", "commons-lang-2.6.jar",  "mail-1.4.jar", "activation-1.1.jar", "mysql-connector-java-5.1.21.jar", "xapi-5.6.100-1-SNAPSHOT.jar"], excl = excludes), cwd=start_path)
 
 #def build_console_proxy ():
 	# binary unsubstitutable files: