Updated Branches: refs/heads/master 8737762bd -> d66db854d
xen: Rename JAR file cloud-xen.jar does not meet the namespace, so rename it to fit in Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/fed79388 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/fed79388 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/fed79388 Branch: refs/heads/master Commit: fed7938814f4975402ffbb653e6bab04d27a84d8 Parents: 8737762 Author: Wido den Hollander <w...@widodh.nl> Authored: Thu Sep 13 19:15:29 2012 +0200 Committer: Wido den Hollander <w...@widodh.nl> Committed: Thu Sep 13 23:19:48 2012 +0200 ---------------------------------------------------------------------- cloud.spec | 2 +- debian/cloud-server.install | 2 +- plugins/hypervisors/xen/build.xml | 2 +- wscript_configure | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fed79388/cloud.spec ---------------------------------------------------------------------- diff --git a/cloud.spec b/cloud.spec index bd49128..0fdebc1 100644 --- a/cloud.spec +++ b/cloud.spec @@ -441,7 +441,7 @@ fi %{_javadir}/%{name}-user-authenticator-ldap.jar %{_javadir}/%{name}-user-authenticator-md5.jar %{_javadir}/%{name}-user-authenticator-plaintext.jar -%{_javadir}/%{name}-xen.jar +%{_javadir}/%{name}-plugin-hypervisor-xen.jar %{_javadir}/%{name}-plugin-elb.jar %{_javadir}/%{name}-plugin-nicira-nvp.jar %config(noreplace) %{_sysconfdir}/%{name}/server/* http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fed79388/debian/cloud-server.install ---------------------------------------------------------------------- diff --git a/debian/cloud-server.install b/debian/cloud-server.install index 76849f0..9cd1eeb 100644 --- a/debian/cloud-server.install +++ b/debian/cloud-server.install @@ -28,4 +28,4 @@ /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-plugin-hypervisor-xen.jar http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fed79388/plugins/hypervisors/xen/build.xml ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/xen/build.xml b/plugins/hypervisors/xen/build.xml index 377d6b7..9d3406f 100755 --- a/plugins/hypervisors/xen/build.xml +++ b/plugins/hypervisors/xen/build.xml @@ -75,7 +75,7 @@ <property name="deps.dir" location="${top.dir}/deps" /> - <property name="xen.jar" value="cloud-xen.jar" /> + <property name="xen.jar" value="cloud-plugin-hypervisor-xen.jar" /> <property name="xen-scripts.dir" location="${base.dir}/plugins/hypervisors/xen/scripts" /> <import file="${build.dir}/build-common.xml"/> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fed79388/wscript_configure ---------------------------------------------------------------------- diff --git a/wscript_configure b/wscript_configure index 0e90963..965847d 100644 --- a/wscript_configure +++ b/wscript_configure @@ -322,7 +322,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 plugin-elb plugin-netapp".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 plugin-hypervisor-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
