incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhais...@apache.org
Subject git commit: CLOUDSTACK-292: Add missing jars to cloud-deps
Date Tue, 09 Oct 2012 11:02:55 GMT
Updated Branches:
  refs/heads/4.0 460b3f821 -> 9b53150cf


CLOUDSTACK-292: Add missing jars to cloud-deps

- fixes axiom-impl version to avoid class load exception
- with copying of libs is not done in cloud.spec anymore, add jars to
  cloud-deps
- make aws-api package depend on cloud-deps


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/9b53150c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/9b53150c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/9b53150c

Branch: refs/heads/4.0
Commit: 9b53150cf5e234453d2ba216da218b1ad56fc321
Parents: 460b3f8
Author: Rohit Yadav <bhaisaab@apache.org>
Authored: Tue Oct 9 16:20:03 2012 +0530
Committer: Rohit Yadav <bhaisaab@apache.org>
Committed: Tue Oct 9 16:20:03 2012 +0530

----------------------------------------------------------------------
 awsapi/pom.xml |    5 +++++
 cloud.spec     |   12 ++++++++++++
 wscript_build  |    3 ++-
 3 files changed, 19 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9b53150c/awsapi/pom.xml
----------------------------------------------------------------------
diff --git a/awsapi/pom.xml b/awsapi/pom.xml
index 044cfda..6f57faf 100644
--- a/awsapi/pom.xml
+++ b/awsapi/pom.xml
@@ -50,6 +50,11 @@
       <version>${cs.axiom.version}</version>
     </dependency>
     <dependency>
+      <groupId>org.apache.ws.commons.axiom</groupId>
+      <artifactId>axiom-impl</artifactId>
+      <version>${cs.axiom.version}</version>
+    </dependency>
+    <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
       <version>${cs.log4j.version}</version>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9b53150c/cloud.spec
----------------------------------------------------------------------
diff --git a/cloud.spec b/cloud.spec
index 2bee65f..0868cc0 100644
--- a/cloud.spec
+++ b/cloud.spec
@@ -286,6 +286,7 @@ Summary:   CloudStack CloudBridge
 Group:     System Environment/Libraries
 Requires: java >= 1.6.0
 Requires: tomcat6
+Requires: %{name}-deps = %{version}
 %if 0%{?fedora} > 15
 Requires: apache-commons-lang
 %endif
@@ -459,6 +460,17 @@ fi
 
 %files deps
 %defattr(0644,root,root,0755)
+%{_javadir}/axiom-*.jar
+%{_javadir}/axis2-*.jar
+%{_javadir}/antlr*.jar
+%{_javadir}/XmlSchema-*.jar
+%{_javadir}/json-simple*.jar
+%{_javadir}/neethi*.jar
+%{_javadir}/woden*.jar
+%{_javadir}/xercesImpl*.jar
+%{_javadir}/xml-apis*.jar
+%{_javadir}/dom4j*.jar
+%{_javadir}/javassist*.jar
 %{_javadir}/commons-codec-1.6.jar
 %{_javadir}/commons-dbcp-1.4.jar
 %{_javadir}/commons-pool-1.6.jar

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9b53150c/wscript_build
----------------------------------------------------------------------
diff --git a/wscript_build b/wscript_build
index 4264822..fe29891 100644
--- a/wscript_build
+++ b/wscript_build
@@ -163,7 +163,8 @@ def build_dependences ():
 	start_path = bld.path.find_dir ("deps")
 
         bld.install_files('${JAVADIR}',start_path.ant_glob(["CAStorSDK-*.jar", "javax.persistence-2.0.0.jar",
"apache-log4j-extras-1.1.jar", "libvirt-0.4.9.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-nodep-2.2.2.jar", "xmlrpc-common-3.*.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-nodep-2.2.2.jar", "xmlrpc-common-3.*.jar",
+         "axiom*.jar", "axis2*.jar", "antlr*.jar", "XmlSchema*.jar", "json-simple*.jar",
"neethi*.jar", "woden*.jar", "xercesImpl*.jar", "xml-apis*.jar", "dom4j*.jar", "javassist*.jar",
          "xmlrpc-client-3.*.jar", "wsdl4j-1.6.2.jar", "bcprov-jdk16-1.45.jar", "jsch-0.1.42.jar",
"jasypt-1.9.0.jar", "commons-configuration-1.8.jar", "mail-1.4.jar", "activation-1.1.jar",
 "xapi-5.6.100-1-SNAPSHOT.jar"], excl = excludes), cwd=start_path)
 
 #def build_console_proxy ():


Mime
View raw message