Updated Branches: refs/heads/4.0 375509780 -> 7bcbae5e9
axis2-1.5.1.jar should be loaded at first, add javaassist dependence Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/7bcbae5e Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/7bcbae5e Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/7bcbae5e Branch: refs/heads/4.0 Commit: 7bcbae5e91a4cd122d0efa7f2542eab73debb6df Parents: 3755097 Author: Edison Su <[email protected]> Authored: Tue Oct 9 19:31:33 2012 -0700 Committer: Edison Su <[email protected]> Committed: Tue Oct 9 19:31:41 2012 -0700 ---------------------------------------------------------------------- debian/cloud-awsapi.install | 1 - debian/control | 2 +- wscript_configure | 2 ++ 3 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7bcbae5e/debian/cloud-awsapi.install ---------------------------------------------------------------------- diff --git a/debian/cloud-awsapi.install b/debian/cloud-awsapi.install index 9304eb3..59642cb 100644 --- a/debian/cloud-awsapi.install +++ b/debian/cloud-awsapi.install @@ -34,4 +34,3 @@ /usr/share/java/woden*.jar /usr/share/java/xercesImpl*.jar /usr/share/java/xml-apis*.jar -/usr/share/java/javassist*.jar http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7bcbae5e/debian/control ---------------------------------------------------------------------- diff --git a/debian/control b/debian/control index c818d8e..7762e73 100644 --- a/debian/control +++ b/debian/control @@ -120,6 +120,6 @@ Description: CloudStack commandline tool Package: cloud-awsapi Provides: cloud-awsapi Architecture: any -Depends: openjdk-6-jre, tomcat6, libcommons-lang-java +Depends: openjdk-6-jre, tomcat6, libcommons-lang-java, libjavassist-java Description: CloudStack AWS API wrapper The CloudStack Amazon Webservices API wrapper http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7bcbae5e/wscript_configure ---------------------------------------------------------------------- diff --git a/wscript_configure b/wscript_configure index eeac3b8..8014540 100644 --- a/wscript_configure +++ b/wscript_configure @@ -101,6 +101,7 @@ systemjars = { "jna.jar", "log4j-1.2.jar", "catalina-tribes.jar", + "javassist.jar", ), 'Windows': ( @@ -321,6 +322,7 @@ conf.env.SYSTEMCLASSPATH = pathsep.join([ in_system_javadir(x) for x in sysjars # these will install on Tomcat6's lib/ directory on Windows and Mac depsclasspath = [ in_javadir(_basename(x)) for x in _glob(_join(conf.srcdir,"deps","*.jar")) ] conf.env.DEPSCLASSPATH = pathsep.join(depsclasspath) +conf.env.DEPSCLASSPATH = "/usr/share/java/axis2-1.5.1.jar:" + conf.env.DEPSCLASSPATH # the MS classpath points to JARs required to run the management server msclasspath = [ in_javadir("%s-%s.jar"%(conf.env.PACKAGE,x)) for x in "utils api core server server-extras core-extras vmware-base ovm dp-user-concentrated-pod dp-user-dispersing host-allocator-random plugin-f5 plugin-netscaler plugin-ovs plugin-srx storage-allocator-random user-authenticator-ldap user-authenticator-md5 user-authenticator-plaintext vmware plugin-hypervisor-xen plugin-nicira-nvp plugin-elb plugin-netapp".split() ]
