Skip to content

Commit 6eedfdf

Browse files
author
Alex Huang
committed
Master pull
2 parents db9cc97 + 9110489 commit 6eedfdf

69 files changed

Lines changed: 792 additions & 354 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,3 +54,4 @@ awsapi/modules/*
5454
.classpath
5555
.project
5656
.settings.xml
57+
.settings/

‎cloud.spec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -441,7 +441,7 @@ fi
441441
%{_javadir}/%{name}-user-authenticator-ldap.jar
442442
%{_javadir}/%{name}-user-authenticator-md5.jar
443443
%{_javadir}/%{name}-user-authenticator-plaintext.jar
444-
%{_javadir}/%{name}-xen.jar
444+
%{_javadir}/%{name}-plugin-hypervisor-xen.jar
445445
%{_javadir}/%{name}-plugin-elb.jar
446446
%{_javadir}/%{name}-plugin-nicira-nvp.jar
447447
%config(noreplace) %{_sysconfdir}/%{name}/server/*

‎console-proxy/systemvm-descriptor.xml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
<!--
2+
Licensed to the Apache Software Foundation (ASF) under one
3+
or more contributor license agreements. See the NOTICE file
4+
distributed with this work for additional information
5+
regarding copyright ownership. The ASF licenses this file
6+
to you under the Apache License, Version 2.0 (the
7+
"License"); you may not use this file except in compliance
8+
with the License. You may obtain a copy of the License at
9+
10+
http://www.apache.org/licenses/LICENSE-2.0
11+
12+
Unless required by applicable law or agreed to in writing,
13+
software distributed under the License is distributed on an
14+
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
KIND, either express or implied. See the License for the
16+
specific language governing permissions and limitations
17+
under the License.
18+
-->
119
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
220
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
321
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">

‎debian/cloud-agent-deps.install‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,4 @@
1515
# specific language governing permissions and limitations
1616
# under the License.
1717

18-
/usr/share/java/gson-1.7.1.jar
1918
/usr/share/java/libvirt-0.4.9.jar

‎debian/cloud-deps.install‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,5 @@
3030
/usr/share/java/jasypt-1.*.jar
3131
/usr/share/java/ejb-api-3.0.jar
3232
/usr/share/java/javax.persistence-2.0.0.jar
33+
/usr/share/java/gson-1.7.1.jar
34+
/usr/share/java/xapi-5.6.100-1-SNAPSHOT.jar

‎debian/cloud-server.install‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,4 @@
2828
/usr/share/java/cloud-user-authenticator-ldap.jar
2929
/usr/share/java/cloud-user-authenticator-md5.jar
3030
/usr/share/java/cloud-user-authenticator-plaintext.jar
31-
/usr/share/java/cloud-xen.jar
31+
/usr/share/java/cloud-plugin-hypervisor-xen.jar

‎debian/control‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Description: CloudStack library dependencies
1616

1717
Package: cloud-agent-deps
1818
Architecture: any
19-
Depends: openjdk-6-jre
19+
Depends: openjdk-6-jre, cloud-deps (= ${source:Version})
2020
Description: CloudStack agent library dependencies
2121
This package contains a number of third-party dependencies
2222
not shipped by distributions, required to run the CloudStack

‎deps/install-non-oss.sh‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,20 @@
11
#!/bin/sh
2+
# Licensed to the Apache Software Foundation (ASF) under one
3+
# or more contributor license agreements. See the NOTICE file
4+
# distributed with this work for additional information
5+
# regarding copyright ownership. The ASF licenses this file
6+
# to you under the Apache License, Version 2.0 (the
7+
# "License"); you may not use this file except in compliance
8+
# with the License. You may obtain a copy of the License at
9+
#
10+
# http://www.apache.org/licenses/LICENSE-2.0
11+
#
12+
# Unless required by applicable law or agreed to in writing,
13+
# software distributed under the License is distributed on an
14+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
# KIND, either express or implied. See the License for the
16+
# specific language governing permissions and limitations
17+
# under the License.
218

319
mvn install:install-file -Dfile=cloud-iControl.jar -DgroupId=com.cloud.com.f5 -DartifactId=icontrol -Dversion=1.0 -Dpackaging=jar
420
mvn install:install-file -Dfile=cloud-netscaler.jar -DgroupId=com.cloud.com.citrix -DartifactId=netscaler -Dversion=1.0 -Dpackaging=jar

‎deps/pom.xml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,17 @@
116116
<artifactId>axis2-ant-plugin</artifactId>
117117
<version>1.4.1</version>
118118
</dependency>
119+
<!-- For vmware-base -->
120+
<dependency>
121+
<groupId>org.apache.axis</groupId>
122+
<artifactId>axis</artifactId>
123+
<version>${cs.axis.version}</version>
124+
</dependency>
125+
<dependency>
126+
<groupId>org.apache.axis</groupId>
127+
<artifactId>axis-jaxrpc</artifactId>
128+
<version>${cs.axis.version}</version>
129+
</dependency>
119130
</dependencies>
120131
<build>
121132
<defaultGoal>install</defaultGoal>

‎docs/en-US/images/NIC_bonding_and_multipath_IO.png‎

Loading

0 commit comments

Comments
 (0)