apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack

Browse Source
This commit is contained in:
David Nalley 2013-02-02 06:48:30 -05:00
commit 4389009e2b
9 changed files with 64 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
console-proxy/pom.xml
View File

@ -125,8 +125,8 @@
<version>1.7</version> <version>1.7</version>
<executions> <executions>
<execution> <execution>
<id>generate-resource</id> <id>copy-cloud-scripts</id>
<phase>generate-resources</phase> <phase>package</phase>
<goals> <goals>
<goal>run</goal> <goal>run</goal>
</goals> </goals>

2
docs/en-US/host-add.xml
View File

@ -26,7 +26,7 @@
<title>Adding a Host</title> <title>Adding a Host</title>
<orderedlist> <orderedlist>
<listitem><para>Before adding a host to the &PRODUCT; configuration, you must first install your chosen hypervisor on the host. &PRODUCT; can manage hosts running VMs under a variety of hypervisors.</para> <listitem><para>Before adding a host to the &PRODUCT; configuration, you must first install your chosen hypervisor on the host. &PRODUCT; can manage hosts running VMs under a variety of hypervisors.</para>
<para>The &PRODUCT; Installation Guide provides instructions on how to install each supported hypervisor <para>The &PRODUCT; Installation Guide provides instructions on how to install each supported hypervisor</para>
<warning><para>Be sure you have performed the additional &PRODUCT;-specific configuration steps described in the hypervisor installation section for your particular hypervisor.</para></warning> <warning><para>Be sure you have performed the additional &PRODUCT;-specific configuration steps described in the hypervisor installation section for your particular hypervisor.</para></warning>
</listitem> </listitem>
<listitem><para>Now add the hypervisor host to &PRODUCT;. The technique to use varies depending on the hypervisor.</para> <listitem><para>Now add the hypervisor host to &PRODUCT;. The technique to use varies depending on the hypervisor.</para>

2
engine/service/pom.xml
View File

@ -27,7 +27,7 @@
</parent> </parent>
<artifactId>cloud-engine-service</artifactId> <artifactId>cloud-engine-service</artifactId>
<packaging>war</packaging> <packaging>war</packaging>
<name>CloudStack Cloud-Engine Service</name> <name>Apache CloudStack Cloud Engine Service</name>
<url>http://www.cloudstack.org</url> <url>http://www.cloudstack.org</url>
<dependencies> <dependencies>
<dependency> <dependency>

2
framework/events/pom.xml
View File

@ -20,7 +20,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>cloud-framework-events</artifactId> <artifactId>cloud-framework-events</artifactId>
<name>Apache CloudStack Event Notification Framework</name> <name>Apache CloudStack Framework - Event Notification</name>
<parent> <parent>
<groupId>org.apache.cloudstack</groupId> <groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-framework</artifactId> <artifactId>cloudstack-framework</artifactId>

1
framework/ipc/pom.xml
View File

@ -12,6 +12,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>cloud-framework-ipc</artifactId> <artifactId>cloud-framework-ipc</artifactId>
<name>Apache CloudStack Framework - IPC</name>
<parent> <parent>
<groupId>org.apache.cloudstack</groupId> <groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-framework</artifactId> <artifactId>cloudstack-framework</artifactId>

2
framework/pom.xml
View File

@ -19,7 +19,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>cloudstack-framework</artifactId> <artifactId>cloudstack-framework</artifactId>
<name>Apache CloudStack framework POM</name> <name>Apache CloudStack Framework</name>
<packaging>pom</packaging> <packaging>pom</packaging>
<parent> <parent>
<groupId>org.apache.cloudstack</groupId> <groupId>org.apache.cloudstack</groupId>

2
framework/rest/pom.xml
View File

@ -26,7 +26,7 @@
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<artifactId>cloud-framework-rest</artifactId> <artifactId>cloud-framework-rest</artifactId>
<name>CloudStack Framework for Providing REST</name> <name>Apache CloudStack Framework - REST</name>
<build> <build>
<defaultGoal>install</defaultGoal> <defaultGoal>install</defaultGoal>
<sourceDirectory>src</sourceDirectory> <sourceDirectory>src</sourceDirectory>

2
plugins/hypervisors/ucs/pom.xml
View File

@ -11,7 +11,7 @@
<groupId>org.apache.cloudstack</groupId> <groupId>org.apache.cloudstack</groupId>
<artifactId>cloud-plugin-hypervisor-ucs</artifactId> <artifactId>cloud-plugin-hypervisor-ucs</artifactId>
<version>4.1.0-SNAPSHOT</version> <version>4.1.0-SNAPSHOT</version>
<name>cloud-plugin-hypervisor-ucs</name> <name>Apache CloudStack Plugin - Hypervisor UCS</name>
<url>http://maven.apache.org</url> <url>http://maven.apache.org</url>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

1
server/pom.xml
View File

@ -126,6 +126,7 @@
<exclude>com/cloud/vpc/*</exclude> <exclude>com/cloud/vpc/*</exclude>
<exclude>com/cloud/api/ListPerfTest.java</exclude> <exclude>com/cloud/api/ListPerfTest.java</exclude>
<exclude>com/cloud/network/vpn/RemoteAccessVpnTest.java</exclude> <exclude>com/cloud/network/vpn/RemoteAccessVpnTest.java</exclude>
<exclude>com/cloud/network/security/SecurityGroupManagerImpl2Test.java</exclude>
</excludes> </excludes>
</configuration> </configuration>
</plugin> </plugin>