Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cloudstack.apache.org
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: widodh@apache.org
To: commits@cloudstack.apache.org
Message-Id: <3465e5932a924337894f564b9435819a@git.apache.org>
Subject: git commit: updated refs/heads/master to e6fd794
Date: Sun, 29 Sep 2013 10:23:27 +0000 (UTC)

Updated Branches:
  refs/heads/master 3ae80acb4 -> e6fd794ca


packaging: Do not depend on JNA and don't include it in the classpath

It's now packaged with maven due to libvirt 0.5.1 and will be included
in the classpath automatically.


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

Branch: refs/heads/master
Commit: e6fd794ca0b10a00f3fc93e5f3e81ab342f5b860
Parents: 3ae80ac
Author: Wido den Hollander <wido@42on.com>
Authored: Sun Sep 29 12:22:46 2013 +0200
Committer: Wido den Hollander <wido@42on.com>
Committed: Sun Sep 29 12:22:46 2013 +0200

----------------------------------------------------------------------
 debian/control                    | 2 +-
 packaging/centos63/cloud-agent.rc | 3 +--
 packaging/centos63/cloud.spec     | 1 -
 packaging/debian/init/cloud-agent | 3 +--
 4 files changed, 3 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e6fd794c/debian/control
----------------------------------------------------------------------
diff --git a/debian/control b/debian/control
index e6d1ef0..b20743d 100644
--- a/debian/control
+++ b/debian/control
@@ -22,7 +22,7 @@ Description: CloudStack server library
 
 Package: cloudstack-agent
 Architecture: all
-Depends: openjdk-6-jre | openjdk-7-jre, cloudstack-common (= ${source:Version}), lsb-base (>= 3.2), libcommons-daemon-java, libjna-java, openssh-client, libvirt0, sysvinit-utils, qemu-kvm, libvirt-bin, uuid-runtime, rsync, grep, iproute, perl-base, perl-modules, ebtables, vlan, wget, jsvc, ipset, python-libvirt
+Depends: openjdk-6-jre | openjdk-7-jre, cloudstack-common (= ${source:Version}), lsb-base (>= 3.2), libcommons-daemon-java, openssh-client, libvirt0, sysvinit-utils, qemu-kvm, libvirt-bin, uuid-runtime, rsync, grep, iproute, perl-base, perl-modules, ebtables, vlan, wget, jsvc, ipset, python-libvirt
 Conflicts: cloud-agent, cloud-agent-libs, cloud-agent-deps, cloud-agent-scripts
 Description: CloudStack agent
  The CloudStack agent is in charge of managing shared computing resources in

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e6fd794c/packaging/centos63/cloud-agent.rc
----------------------------------------------------------------------
diff --git a/packaging/centos63/cloud-agent.rc b/packaging/centos63/cloud-agent.rc
index b378488..ab49524 100755
--- a/packaging/centos63/cloud-agent.rc
+++ b/packaging/centos63/cloud-agent.rc
@@ -61,8 +61,7 @@ PCP=`ls /usr/share/cloudstack-agent/plugins/*.jar 2>/dev/null | tr '\n' ':' | se
 
 # We need to append the JSVC daemon JAR to the classpath
 # AgentShell implements the JSVC daemon methods
-# We also need JNA in the classpath (from the distribution) for the Libvirt Java bindings
-export CLASSPATH="/usr/share/java/commons-daemon.jar:/usr/share/java/jna.jar:$ACP:$PCP:/etc/cloudstack/agent:/usr/share/cloudstack-common/scripts"
+export CLASSPATH="/usr/share/java/commons-daemon.jar:$ACP:$PCP:/etc/cloudstack/agent:/usr/share/cloudstack-common/scripts"
 
 start() {
     echo -n $"Starting $PROGNAME: "

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e6fd794c/packaging/centos63/cloud.spec
----------------------------------------------------------------------
diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec
index b5174c5..17fb2b1 100644
--- a/packaging/centos63/cloud.spec
+++ b/packaging/centos63/cloud.spec
@@ -112,7 +112,6 @@ The Apache CloudStack files shared between agent and management server
 %package agent
 Summary: CloudStack Agent for KVM hypervisors
 Requires: java >= 1.6.0
-Requires: jna >= 3.2.4
 Requires: %{name}-common = %{_ver}
 Requires: libvirt
 Requires: bridge-utils

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e6fd794c/packaging/debian/init/cloud-agent
----------------------------------------------------------------------
diff --git a/packaging/debian/init/cloud-agent b/packaging/debian/init/cloud-agent
index 29f6488..e733875 100755
--- a/packaging/debian/init/cloud-agent
+++ b/packaging/debian/init/cloud-agent
@@ -60,8 +60,7 @@ PCP=`ls /usr/share/cloudstack-agent/plugins/*.jar 2>/dev/null | tr '\n' ':' | se
 
 # We need to append the JSVC daemon JAR to the classpath
 # AgentShell implements the JSVC daemon methods
-# We also need JNA in the classpath (from the distribution) for the Libvirt Java bindings
-export CLASSPATH="/usr/share/java/commons-daemon.jar:/usr/share/java/jna.jar:$ACP:$PCP:/etc/cloudstack/agent"
+export CLASSPATH="/usr/share/java/commons-daemon.jar:$ACP:$PCP:/etc/cloudstack/agent"
 
 wait_for_network() {
     i=1