You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by al...@apache.org on 2012/07/18 02:11:57 UTC
[4/6] git commit: fix ubuntu 12.04 build
fix ubuntu 12.04 build
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/dfb0eed5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/dfb0eed5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/dfb0eed5
Branch: refs/heads/vpc
Commit: dfb0eed5a42ead051283229b2a58652f80d9ab3a
Parents: 88205a7
Author: Edison Su <ed...@citrix.com>
Authored: Mon Jul 16 17:59:52 2012 -0700
Committer: Edison Su <ed...@citrix.com>
Committed: Mon Jul 16 18:00:05 2012 -0700
----------------------------------------------------------------------
.../ubuntu/SYSCONFDIR/init.d/cloud-management.in | 2 +-
debian/cloud-daemonize.install | 2 -
debian/cloud-deps.install | 2 +-
debian/cloud-server.install | 16 ++++++++++++
debian/cloud-test.install | 6 ----
debian/control | 19 ---------------
wscript_configure | 7 +++--
7 files changed, 22 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dfb0eed5/client/distro/ubuntu/SYSCONFDIR/init.d/cloud-management.in
----------------------------------------------------------------------
diff --git a/client/distro/ubuntu/SYSCONFDIR/init.d/cloud-management.in b/client/distro/ubuntu/SYSCONFDIR/init.d/cloud-management.in
index 32855a5..2711ffc 100755
--- a/client/distro/ubuntu/SYSCONFDIR/init.d/cloud-management.in
+++ b/client/distro/ubuntu/SYSCONFDIR/init.d/cloud-management.in
@@ -55,7 +55,7 @@ TOMCAT6_USER=tomcat6
# The first existing directory is used for JAVA_HOME (if JAVA_HOME is not
# defined in $DEFAULT)
-JDK_DIRS="/usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-6-sun /usr/lib/jvm/java-1.5.0-sun /usr/lib/j2sdk1.5-sun /usr/lib/j2sdk1.5-ibm"
+JDK_DIRS="/usr/lib/jvm/java-1.6.0-openjdk-i386/ /usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-6-sun /usr/lib/jvm/java-1.5.0-sun /usr/lib/j2sdk1.5-sun /usr/lib/j2sdk1.5-ibm"
# Look for the right JVM to use
for jdir in $JDK_DIRS; do
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dfb0eed5/debian/cloud-daemonize.install
----------------------------------------------------------------------
diff --git a/debian/cloud-daemonize.install b/debian/cloud-daemonize.install
deleted file mode 100644
index 8ffbb22..0000000
--- a/debian/cloud-daemonize.install
+++ /dev/null
@@ -1,2 +0,0 @@
-/usr/bin/cloud-daemonize
-
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dfb0eed5/debian/cloud-deps.install
----------------------------------------------------------------------
diff --git a/debian/cloud-deps.install b/debian/cloud-deps.install
index 9381a48..f0f7235 100644
--- a/debian/cloud-deps.install
+++ b/debian/cloud-deps.install
@@ -17,7 +17,7 @@
/usr/share/java/cloud-jstl-1.2.jar
/usr/share/java/cloud-axis.jar
/usr/share/java/cloud-commons-discovery.jar
-/usr/share/java/cloud-wsdl4j.jar
+/usr/share/java/cloud-wsdl4j-1.6.2.jar
/usr/share/java/cloud-bcprov-jdk16-1.45.jar
/usr/share/java/cloud-jsch-0.1.42.jar
/usr/share/java/cloud-iControl.jar
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dfb0eed5/debian/cloud-server.install
----------------------------------------------------------------------
diff --git a/debian/cloud-server.install b/debian/cloud-server.install
index 98380cb..a88fbf0 100644
--- a/debian/cloud-server.install
+++ b/debian/cloud-server.install
@@ -1,3 +1,19 @@
/usr/share/java/cloud-server.jar
/usr/share/java/cloud-ovm.jar
/etc/cloud/server/*
+/usr/share/java/cloud-dp-user-concentrated-pod.jar
+/usr/share/java/cloud-dp-user-dispersing.jar
+/usr/share/java/cloud-host-allocator-random.jar
+/usr/share/java/cloud-plugin-elb.jar
+/usr/share/java/cloud-plugin-f5.jar
+/usr/share/java/cloud-plugin-netapp.jar
+/usr/share/java/cloud-plugin-netscaler.jar
+/usr/share/java/cloud-plugin-ovs.jar
+/usr/share/java/cloud-plugin-srx.jar
+/usr/share/java/cloud-plugin-nicira-nvp.jar
+/usr/share/java/cloud-storage-allocator-random.jar
+/usr/share/java/cloud-user-authenticator-ldap.jar
+/usr/share/java/cloud-user-authenticator-md5.jar
+/usr/share/java/cloud-user-authenticator-plaintext.jar
+/usr/share/java/cloud-xen.jar
+/usr/share/java/cloud-vmware.jar
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dfb0eed5/debian/cloud-test.install
----------------------------------------------------------------------
diff --git a/debian/cloud-test.install b/debian/cloud-test.install
deleted file mode 100644
index 37efeae..0000000
--- a/debian/cloud-test.install
+++ /dev/null
@@ -1,6 +0,0 @@
-/usr/bin/cloud-run-test
-/usr/share/java/cloud-test.jar
-/var/lib/cloud/test/*
-/usr/lib/cloud/test/*
-/etc/cloud/test/*
-
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dfb0eed5/debian/control
----------------------------------------------------------------------
diff --git a/debian/control b/debian/control
index 517366d..1ffb937 100644
--- a/debian/control
+++ b/debian/control
@@ -73,15 +73,6 @@ Description: CloudStack agent scripts
will participate in your cloud -- this is a requirement for the CloudStack
agent.
-Package: cloud-daemonize
-Provides: vmops-daemonize
-Conflicts: vmops-daemonize
-Replaces: vmops-daemonize
-Architecture: any
-Description: CloudStack daemonization utility
- This package contains a program that daemonizes the specified
- process. The CloudStack Cloud Stack uses this to start the agent
- as a service.
Package: cloud-core
Provides: vmops-core
@@ -93,16 +84,6 @@ Description: CloudStack core library
The CloudStack core libraries provide a set of Java classes used
in the CloudStack Cloud Stack.
-Package: cloud-test
-Provides: vmops-test
-Conflicts: vmops-test
-Replaces: vmops-test
-Architecture: any
-Depends: openjdk-6-jre, wget, cloud-utils (= ${source:Version}), cloud-deps (= ${source:Version})
-Description: CloudStack test suite
- The CloudStack test package contains a suite of automated tests
- that the very much appreciated QA team at CloudStack constantly
- uses to help increase the quality of the Cloud Stack.
Package: cloud-client
Provides: vmops-client
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dfb0eed5/wscript_configure
----------------------------------------------------------------------
diff --git a/wscript_configure b/wscript_configure
index 70fb163..e6d9958 100644
--- a/wscript_configure
+++ b/wscript_configure
@@ -56,9 +56,10 @@ systemjars = {
(
"servlet-api-2.5.jar",
"jsp-api-2.1.jar",
- "jasper-6.0.28.jar",
+ "jasper.jar",
"el-api-2.1.jar",
- "jasper-el-6.0.28.jar",
+ "jasper-el.jar",
+ "ecj.jar",
"cglib.jar",
"asm3.jar",
"jetty.jar",
@@ -288,7 +289,7 @@ depsclasspath = [ in_javadir(_basename(x)) for x in _glob(_join(conf.srcdir,"dep
conf.env.DEPSCLASSPATH = pathsep.join(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 xen plugin-nicira-nvp".split() ]
+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 xen plugin-nicira-nvp plugin-elb plugin-netapp".split() ]
conf.env.MSCLASSPATH = pathsep.join(msclasspath)
# the agent and simulator classpaths point to JARs required to run these two applications