Skip to content

Commit 1d0a10c

Browse files
author
Alex Huang
committed
Merged master over to javelin to get new poms and maven build
2 parents 07728b4 + 8642755 commit 1d0a10c

505 files changed

Lines changed: 13489 additions & 11130 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.

‎LICENSE‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -275,6 +275,40 @@ Within the console-proxy/js directory
275275
jquery.js
276276

277277

278+
Within the deps directory
279+
licensed under the BSD (2-clause) for XenServerJava http://www.opensource.org/licenses/BSD-2-Clause (as follows)
280+
281+
Copyright (c) Citrix Systems, Inc.
282+
All rights reserved.
283+
284+
Redistribution and use in source and binary forms, with or without
285+
modification, are permitted provided that the following conditions are
286+
met:
287+
288+
1) Redistributions of source code must retain the above copyright
289+
notice, this list of conditions and the following disclaimer.
290+
291+
2) Redistributions in binary form must reproduce the above copyright
292+
notice, this list of conditions and the following disclaimer in
293+
the documentation and/or other materials provided with the
294+
distribution.
295+
296+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
297+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
298+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
299+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
300+
HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
301+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
302+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
303+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
304+
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
305+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
306+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
307+
308+
from Citrix Systems, Inc http://www.citrix.com/
309+
XenServerJava http://community.citrix.com/cdn/xs/sdks/
310+
311+
278312
Within the deps/awsapi-lib directory
279313
licensed under the ANTLR 2 License http://www.antlr2.org/license.html (as follows)
280314

‎README.md‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,18 @@ http://cloudstack.org/download.html
4141
[Users Mailing list](mailto:cloudstack-users-subscribe@incubator.apache.org)
4242
[Commits mailing list](mailto:cloudstack-commits-subscribe@incubator.apache.org)
4343

44-
44+
#Maven build
45+
Some third parties jars are non available in Maven central.
46+
So install it with: cd deps&&sh ./install-non-oss.sh
47+
Now you are able to activate nonoss build with adding -Dnonoss to maven cli.
48+
49+
to run webapp client:
50+
mvn org.apache.tomcat.maven:tomcat7-maven-plugin:2.0-beta-1:run -pl :cloud-client-ui -am -Pclient -Dnonoss
51+
then hit: http://localhost:8080/cloud-client-ui/
52+
or add in your ~/.m2/settings.xml
53+
<pluginGroups>
54+
<pluginGroup>org.apache.tomcat.maven</pluginGroup>
55+
</pluginGroups>
56+
and save your fingers with mvn tomcat7:run -pl :cloud-client-ui -am -Pclient -Dnonoss
57+
58+
If you want to use ide debug: replace mvn with mvnDebug and attach your ide debugger to port 8000

‎agent/pom.xml‎

Lines changed: 46 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -17,52 +17,50 @@
1717
under the License.
1818
-->
1919
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
20-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
21-
<modelVersion>4.0.0</modelVersion>
22-
<artifactId>cloud-agent</artifactId>
23-
<name>Apache CloudStack Agents</name>
24-
<parent>
25-
<groupId>com.cloud</groupId>
26-
<artifactId>cloud-parent</artifactId>
27-
<version>4.0.0-SNAPSHOT</version>
28-
<relativePath>../parent/pom.xml</relativePath>
29-
</parent>
30-
<dependencies>
31-
<dependency>
32-
<groupId>com.cloud</groupId>
33-
<artifactId>cloud-core</artifactId>
34-
<version>${project.version}</version>
35-
</dependency>
36-
<dependency>
37-
<groupId>org.mortbay.jetty</groupId>
38-
<artifactId>jetty</artifactId>
39-
<version>6.1.26</version>
40-
</dependency>
41-
<dependency>
42-
<groupId>com.cloud</groupId>
43-
<artifactId>cloud-utils</artifactId>
44-
<version>${project.version}</version>
45-
<classifier>tests</classifier>
46-
<scope>test</scope>
47-
</dependency>
48-
</dependencies>
49-
<build>
50-
<defaultGoal>install</defaultGoal>
51-
<sourceDirectory>src</sourceDirectory>
52-
<testSourceDirectory>test</testSourceDirectory>
53-
<plugins>
54-
<plugin>
55-
<groupId>org.apache.maven.plugins</groupId>
56-
<artifactId>maven-jar-plugin</artifactId>
57-
<version>2.2</version>
58-
<executions>
59-
<execution>
60-
<goals>
61-
<goal>test-jar</goal>
62-
</goals>
63-
</execution>
64-
</executions>
65-
</plugin>
66-
</plugins>
67-
</build>
20+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
21+
<modelVersion>4.0.0</modelVersion>
22+
<artifactId>cloud-agent</artifactId>
23+
<name>Apache CloudStack Agents</name>
24+
<parent>
25+
<groupId>org.apache.cloudstack</groupId>
26+
<artifactId>cloudstack</artifactId>
27+
<version>4.0.0-SNAPSHOT</version>
28+
</parent>
29+
<dependencies>
30+
<dependency>
31+
<groupId>org.apache.cloudstack</groupId>
32+
<artifactId>cloud-core</artifactId>
33+
<version>${project.version}</version>
34+
</dependency>
35+
<dependency>
36+
<groupId>org.mortbay.jetty</groupId>
37+
<artifactId>jetty</artifactId>
38+
<version>6.1.26</version>
39+
</dependency>
40+
<dependency>
41+
<groupId>org.apache.cloudstack</groupId>
42+
<artifactId>cloud-utils</artifactId>
43+
<version>${project.version}</version>
44+
<classifier>tests</classifier>
45+
<scope>test</scope>
46+
</dependency>
47+
</dependencies>
48+
<build>
49+
<defaultGoal>install</defaultGoal>
50+
<sourceDirectory>src</sourceDirectory>
51+
<testSourceDirectory>test</testSourceDirectory>
52+
<plugins>
53+
<plugin>
54+
<groupId>org.apache.maven.plugins</groupId>
55+
<artifactId>maven-jar-plugin</artifactId>
56+
<executions>
57+
<execution>
58+
<goals>
59+
<goal>test-jar</goal>
60+
</goals>
61+
</execution>
62+
</executions>
63+
</plugin>
64+
</plugins>
65+
</build>
6866
</project>

‎api/pom.xml‎

Lines changed: 25 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -17,30 +17,29 @@
1717
under the License.
1818
-->
1919
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
20-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
21-
<modelVersion>4.0.0</modelVersion>
22-
<artifactId>cloud-api</artifactId>
23-
<name>Apache CloudStack API</name>
24-
<parent>
25-
<groupId>com.cloud</groupId>
26-
<artifactId>cloud-parent</artifactId>
27-
<version>4.0.0-SNAPSHOT</version>
28-
<relativePath>../parent/pom.xml</relativePath>
29-
</parent>
30-
<dependencies>
31-
<dependency>
32-
<groupId>com.cloud</groupId>
33-
<artifactId>cloud-utils</artifactId>
34-
<version>${project.version}</version>
35-
</dependency>
36-
<dependency>
37-
<groupId>com.google.code.gson</groupId>
38-
<artifactId>gson</artifactId>
39-
<version>${cs.gson.version}</version>
40-
</dependency>
41-
</dependencies>
42-
<build>
43-
<defaultGoal>install</defaultGoal>
44-
<sourceDirectory>src</sourceDirectory>
45-
</build>
20+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
21+
<modelVersion>4.0.0</modelVersion>
22+
<artifactId>cloud-api</artifactId>
23+
<name>Apache CloudStack API</name>
24+
<parent>
25+
<groupId>org.apache.cloudstack</groupId>
26+
<artifactId>cloudstack</artifactId>
27+
<version>4.0.0-SNAPSHOT</version>
28+
</parent>
29+
<dependencies>
30+
<dependency>
31+
<groupId>org.apache.cloudstack</groupId>
32+
<artifactId>cloud-utils</artifactId>
33+
<version>${project.version}</version>
34+
</dependency>
35+
<dependency>
36+
<groupId>com.google.code.gson</groupId>
37+
<artifactId>gson</artifactId>
38+
<version>${cs.gson.version}</version>
39+
</dependency>
40+
</dependencies>
41+
<build>
42+
<defaultGoal>install</defaultGoal>
43+
<sourceDirectory>src</sourceDirectory>
44+
</build>
4645
</project>

‎api/src/com/cloud/api/response/ExceptionResponse.java‎

Lines changed: 25 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,17 @@
1616
// under the License.
1717
package com.cloud.api.response;
1818

19-
import com.cloud.utils.IdentityProxy;
19+
import java.util.ArrayList;
20+
2021
import com.cloud.serializer.Param;
22+
import com.cloud.utils.IdentityProxy;
2123
import com.google.gson.annotations.SerializedName;
22-
import java.util.ArrayList;
2324

2425
public class ExceptionResponse extends BaseResponse {
25-
@SerializedName("uuidList") @Param(description="List of uuids associated with this error")
26-
private ArrayList<IdentityProxy> idList = new ArrayList<IdentityProxy>();
27-
26+
27+
@SerializedName("uuidList") @Param(description="List of uuids associated with this error")
28+
private ArrayList<IdentityProxy> idList = new ArrayList<IdentityProxy>();
29+
2830
@SerializedName("errorcode") @Param(description="numeric code associated with this error")
2931
private Integer errorCode;
3032

@@ -49,17 +51,22 @@ public String getErrorText() {
4951
public void setErrorText(String errorText) {
5052
this.errorText = errorText;
5153
}
52-
53-
public void addProxyObject(String tableName, Long id, String idFieldName) {
54-
idList.add(new IdentityProxy(tableName, id, idFieldName));
55-
return;
56-
}
57-
58-
public ArrayList<IdentityProxy> getIdProxyList() {
59-
return idList;
60-
}
61-
62-
public void setCSErrorCode(int cserrcode) {
63-
this.csErrorCode = cserrcode;
64-
}
54+
55+
public void addProxyObject(String tableName, Long id, String idFieldName) {
56+
idList.add(new IdentityProxy(tableName, id, idFieldName));
57+
return;
58+
}
59+
60+
public ArrayList<IdentityProxy> getIdProxyList() {
61+
return idList;
62+
}
63+
64+
public void setCSErrorCode(int cserrcode) {
65+
this.csErrorCode = cserrcode;
66+
}
67+
68+
@Override
69+
public String toString() {
70+
return ("Error Code: " + errorCode + " Error text: " + errorText);
71+
}
6572
}

‎api/src/com/cloud/api/response/UserVmResponse.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,9 @@ public class UserVmResponse extends BaseResponse implements ControlledEntityResp
158158
@SerializedName(ApiConstants.TAGS) @Param(description="the list of resource tags associated with vm", responseObject = ResourceTagResponse.class)
159159
private List<ResourceTagResponse> tags;
160160

161+
@SerializedName(ApiConstants.SSH_KEYPAIR) @Param(description="ssh key-pair")
162+
private String keyPairName;
163+
161164
public void setHypervisor(String hypervisor) {
162165
this.hypervisor = hypervisor;
163166
}
@@ -348,4 +351,8 @@ public void setInstanceName(String instanceName) {
348351
public void setTags(List<ResourceTagResponse> tags) {
349352
this.tags = tags;
350353
}
354+
355+
public void setKeyPairName(String keyPairName) {
356+
this.keyPairName = keyPairName;
357+
}
351358
}

‎api/src/com/cloud/storage/GuestOsCategory.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
package com.cloud.storage;
1818

1919
public interface GuestOsCategory {
20+
// Used by OS preference, 'None' for no OS preference
21+
public static final String CATEGORY_NONE ="None";
2022
long getId();
2123

2224
String getName();

‎awsapi-setup/setup/cloudstack-aws-api-register‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/cygdrive/c/python26/python
1+
#!/usr/bin/python
22
#
33
# Licensed to the Apache Software Foundation (ASF) under one
44
# or more contributor license agreements. See the NOTICE file

‎awsapi/.classpath‎

Lines changed: 65 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,68 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry kind="src" output="target/classes" path="src">
4-
<attributes>
5-
<attribute name="optional" value="true"/>
6-
<attribute name="maven.pomderived" value="true"/>
7-
</attributes>
8-
</classpathentry>
9-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
10-
<attributes>
11-
<attribute name="maven.pomderived" value="true"/>
12-
</attributes>
13-
</classpathentry>
14-
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
15-
<attributes>
16-
<attribute name="maven.pomderived" value="true"/>
17-
</attributes>
18-
</classpathentry>
19-
<classpathentry kind="output" path="target/classes"/>
3+
<classpathentry kind="src" path="src"/>
4+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
5+
<classpathentry combineaccessrules="false" kind="src" path="/deps"/>
6+
<classpathentry kind="lib" path="/deps/awsapi-lib/antlr-2.7.6.jar"/>
7+
<classpathentry kind="lib" path="/deps/awsapi-lib/apache-log4j-extras-1.0.jar"/>
8+
<classpathentry kind="lib" path="/deps/awsapi-lib/axiom-api-1.2.8.jar"/>
9+
<classpathentry kind="lib" path="/deps/awsapi-lib/axiom-impl-1.2.8.jar"/>
10+
<classpathentry kind="lib" path="/deps/awsapi-lib/axis2-1.5.1.jar"/>
11+
<classpathentry kind="lib" path="/deps/awsapi-lib/axis2-adb-1.5.1.jar"/>
12+
<classpathentry kind="lib" path="/deps/awsapi-lib/axis2-ant-plugin-1.5.1.jar"/>
13+
<classpathentry kind="lib" path="/deps/awsapi-lib/axis2-jaxbri-1.5.1.jar"/>
14+
<classpathentry kind="lib" path="/deps/awsapi-lib/axis2-jaxws-1.5.1.jar"/>
15+
<classpathentry kind="lib" path="/deps/awsapi-lib/axis2-jibx-1.5.1.jar"/>
16+
<classpathentry kind="lib" path="/deps/awsapi-lib/axis2-json-1.5.1.jar"/>
17+
<classpathentry kind="lib" path="/deps/awsapi-lib/axis2-kernel-1.5.1.jar"/>
18+
<classpathentry kind="lib" path="/deps/awsapi-lib/axis2-transport-http-1.5.1.jar"/>
19+
<classpathentry kind="lib" path="/deps/awsapi-lib/axis2-transport-local-1.5.1.jar"/>
20+
<classpathentry kind="lib" path="/deps/awsapi-lib/cloud-gson.jar"/>
21+
<classpathentry kind="lib" path="/deps/awsapi-lib/commons-codec-1.4.jar"/>
22+
<classpathentry kind="lib" path="/deps/awsapi-lib/commons-collections-3.1.jar"/>
23+
<classpathentry kind="lib" path="/deps/awsapi-lib/commons-fileupload-1.2.jar"/>
24+
<classpathentry kind="lib" path="/deps/awsapi-lib/commons-httpclient-3.1.jar"/>
25+
<classpathentry kind="lib" path="/deps/awsapi-lib/commons-io-1.4.jar"/>
26+
<classpathentry kind="lib" path="/deps/awsapi-lib/commons-logging-1.1.1.jar"/>
27+
<classpathentry kind="lib" path="/deps/awsapi-lib/dom4j-1.6.1.jar"/>
28+
<classpathentry kind="lib" path="/deps/awsapi-lib/httpcore-4.0.jar"/>
29+
<classpathentry kind="lib" path="/deps/awsapi-lib/javassist-3.9.0.GA.jar"/>
30+
<classpathentry kind="lib" path="/deps/awsapi-lib/jaxb-api-2.1.jar"/>
31+
<classpathentry kind="lib" path="/deps/awsapi-lib/jaxb-impl-2.1.7.jar"/>
32+
<classpathentry kind="lib" path="/deps/awsapi-lib/jaxb-xjc-2.1.7.jar"/>
33+
<classpathentry kind="lib" path="/deps/awsapi-lib/jsch-0.1.42.jar"/>
34+
<classpathentry kind="lib" path="/deps/awsapi-lib/json_simple-1.1.jar"/>
35+
<classpathentry kind="lib" path="/deps/awsapi-lib/jta-1.1.jar"/>
36+
<classpathentry kind="lib" path="/deps/awsapi-lib/junit-4.8.1.jar"/>
37+
<classpathentry kind="lib" path="/deps/awsapi-lib/log4j-1.2.15.jar"/>
38+
<classpathentry kind="lib" path="/deps/awsapi-lib/mail-1.4.jar"/>
39+
<classpathentry kind="lib" path="/deps/awsapi-lib/mysql-connector-java-5.1.7-bin.jar"/>
40+
<classpathentry kind="lib" path="/deps/awsapi-lib/neethi-2.0.4.jar"/>
41+
<classpathentry kind="lib" path="/deps/awsapi-lib/slf4j-api-1.5.11.jar"/>
42+
<classpathentry kind="lib" path="/deps/awsapi-lib/slf4j-jdk14-1.5.11.jar"/>
43+
<classpathentry kind="lib" path="/deps/awsapi-lib/woden-api-1.0M8.jar"/>
44+
<classpathentry kind="lib" path="/deps/awsapi-lib/woden-impl-dom-1.0M8.jar"/>
45+
<classpathentry kind="lib" path="/deps/awsapi-lib/xercesImpl.jar"/>
46+
<classpathentry kind="lib" path="/deps/awsapi-lib/xml-apis.jar"/>
47+
<classpathentry kind="lib" path="/deps/awsapi-lib/XmlSchema-1.4.3.jar"/>
48+
<classpathentry kind="lib" path="/deps/awsapi-lib/rampart-lib/bcprov-jdk16-145.jar"/>
49+
<classpathentry kind="lib" path="/deps/awsapi-lib/rampart-lib/commons-collections-3.1.jar"/>
50+
<classpathentry kind="lib" path="/deps/awsapi-lib/rampart-lib/joda-time-1.5.2.jar"/>
51+
<classpathentry kind="lib" path="/deps/awsapi-lib/rampart-lib/opensaml-1.1.jar"/>
52+
<classpathentry kind="lib" path="/deps/awsapi-lib/rampart-lib/opensaml-2.2.3.jar"/>
53+
<classpathentry kind="lib" path="/deps/awsapi-lib/rampart-lib/openws-1.2.2.jar"/>
54+
<classpathentry kind="lib" path="/deps/awsapi-lib/rampart-lib/rampart-core-1.5.jar"/>
55+
<classpathentry kind="lib" path="/deps/awsapi-lib/rampart-lib/rampart-policy-1.5.jar"/>
56+
<classpathentry kind="lib" path="/deps/awsapi-lib/rampart-lib/rampart-trust-1.5.jar"/>
57+
<classpathentry kind="lib" path="/deps/awsapi-lib/rampart-lib/slf4j-api-1.5.11.jar"/>
58+
<classpathentry kind="lib" path="/deps/awsapi-lib/rampart-lib/slf4j-jdk14-1.5.11.jar"/>
59+
<classpathentry kind="lib" path="/deps/awsapi-lib/rampart-lib/velocity-1.5.jar"/>
60+
<classpathentry kind="lib" path="/deps/awsapi-lib/rampart-lib/wss4j-1.5.8.jar"/>
61+
<classpathentry kind="lib" path="/deps/awsapi-lib/rampart-lib/xmlsec-1.4.2.jar"/>
62+
<classpathentry kind="lib" path="/deps/awsapi-lib/rampart-lib/xmltooling-1.2.0.jar"/>
63+
<classpathentry kind="lib" path="/deps/cloud-servlet-api.jar"/>
64+
<classpathentry kind="lib" path="/deps/cloud-javax.persistence-2.0.0.jar"/>
65+
<classpathentry combineaccessrules="false" kind="src" path="/utils"/>
66+
<classpathentry kind="lib" path="/deps/cloud-ehcache.jar"/>
67+
<classpathentry kind="output" path="bin"/>
2068
</classpath>

0 commit comments

Comments
 (0)