You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ah...@apache.org on 2012/11/16 20:15:10 UTC
[1/2] git commit: Added a war for cloud-engine
Updated Branches:
refs/heads/javelin 23a35db95 -> 71f2af5c0
Added a war for cloud-engine
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/dd198ffd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/dd198ffd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/dd198ffd
Branch: refs/heads/javelin
Commit: dd198ffd4f450bfe118735f488f32a22b3e5f5af
Parents: 23a35db
Author: Alex Huang <al...@citrix.com>
Authored: Thu Nov 15 16:10:01 2012 -0800
Committer: Alex Huang <al...@citrix.com>
Committed: Fri Nov 16 08:47:58 2012 -0800
----------------------------------------------------------------------
.../org/apache/cloudstack/compute/ComputeGuru.java | 34 +++++++++++++++
engine/pom.xml | 7 ++-
engine/service/pom.xml | 27 ++++++++++++
engine/service/src/main/webapp/WEB-INF/web.xml | 7 +++
engine/service/src/main/webapp/index.jsp | 5 ++
5 files changed, 77 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dd198ffd/engine/components-api/src/org/apache/cloudstack/compute/ComputeGuru.java
----------------------------------------------------------------------
diff --git a/engine/components-api/src/org/apache/cloudstack/compute/ComputeGuru.java b/engine/components-api/src/org/apache/cloudstack/compute/ComputeGuru.java
new file mode 100644
index 0000000..5dbe0c6
--- /dev/null
+++ b/engine/components-api/src/org/apache/cloudstack/compute/ComputeGuru.java
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cloudstack.compute;
+
+import com.cloud.vm.VirtualMachineProfile;
+
+/**
+ * ComputeGuru understands everything about the hypervisor.
+ *
+ */
+public interface ComputeGuru {
+ String getVersion();
+ String getHypervisor();
+ void start(VirtualMachineProfile vm);
+ void stop(VirtualMachineProfile vm);
+
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dd198ffd/engine/pom.xml
----------------------------------------------------------------------
diff --git a/engine/pom.xml b/engine/pom.xml
index ba8b738..f35c14b 100644
--- a/engine/pom.xml
+++ b/engine/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -15,8 +16,7 @@
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
--->
-<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>
<artifactId>cloud-engine</artifactId>
<name>Apache CloudStack Cloud Engine</name>
@@ -40,5 +40,6 @@
<module>components-api</module>
<module>schema</module>
<module>network</module>
+ <module>service</module>
</modules>
-</project>
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dd198ffd/engine/service/pom.xml
----------------------------------------------------------------------
diff --git a/engine/service/pom.xml b/engine/service/pom.xml
new file mode 100644
index 0000000..b0dd6c2
--- /dev/null
+++ b/engine/service/pom.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.cloudstack</groupId>
+ <artifactId>cloud-engine</artifactId>
+ <version>4.1.0-SNAPSHOT</version>
+ </parent>
+ <groupId>org.apache.cloudstack</groupId>
+ <artifactId>cloud-engine-service</artifactId>
+ <version>4.1.0-SNAPSHOT</version>
+ <packaging>war</packaging>
+ <name>service Maven Webapp</name>
+ <url>http://maven.apache.org</url>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <finalName>service</finalName>
+ </build>
+</project>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dd198ffd/engine/service/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/engine/service/src/main/webapp/WEB-INF/web.xml b/engine/service/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 0000000..04563ea
--- /dev/null
+++ b/engine/service/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,7 @@
+<!DOCTYPE web-app PUBLIC
+ "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+ "http://java.sun.com/dtd/web-app_2_3.dtd" >
+
+<web-app>
+ <display-name>Archetype Created Web Application</display-name>
+</web-app>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dd198ffd/engine/service/src/main/webapp/index.jsp
----------------------------------------------------------------------
diff --git a/engine/service/src/main/webapp/index.jsp b/engine/service/src/main/webapp/index.jsp
new file mode 100644
index 0000000..6f07b72
--- /dev/null
+++ b/engine/service/src/main/webapp/index.jsp
@@ -0,0 +1,5 @@
+<html>
+<body>
+<h2>Hello World!</h2>
+</body>
+</html>