From 298d224f83fc28f305014107c6781f149a6a5120 Mon Sep 17 00:00:00 2001 From: Alex Huang Date: Tue, 11 Sep 2012 18:14:42 -0700 Subject: [PATCH] Added extra maven files --- .../org.eclipse.core.resources.prefs | 2 + .../org.eclipse.core.resources.prefs | 2 +- awsapi/.classpath | 81 ++++--------------- .../org.eclipse.core.resources.prefs | 1 + awsapi/pom.xml | 35 ++++++++ console-proxy/.classpath | 65 +++++++++------ console-proxy/.project | 39 +++------ .../org.eclipse.core.resources.prefs | 2 + console-proxy/pom.xml | 3 +- .../framework/ipc/ResultHandler.java | 37 +++++++++ .../framework/ipc/{Ipc.java => Signal.java} | 2 +- ...ntercepter.java => SignalIntercepter.java} | 2 +- platform/compute/pom.xml | 4 +- 13 files changed, 156 insertions(+), 119 deletions(-) mode change 100644 => 100755 console-proxy/.classpath mode change 100644 => 100755 console-proxy/.project create mode 100755 framework/ipc/src/org/apache/cloudstack/framework/ipc/ResultHandler.java rename framework/ipc/src/org/apache/cloudstack/framework/ipc/{Ipc.java => Signal.java} (97%) rename framework/ipc/src/org/apache/cloudstack/framework/ipc/{IpcIntercepter.java => SignalIntercepter.java} (96%) diff --git a/agent/.settings/org.eclipse.core.resources.prefs b/agent/.settings/org.eclipse.core.resources.prefs index 99f26c0203a..104c8ec9841 100644 --- a/agent/.settings/org.eclipse.core.resources.prefs +++ b/agent/.settings/org.eclipse.core.resources.prefs @@ -1,2 +1,4 @@ eclipse.preferences.version=1 encoding/=UTF-8 +encoding/src=UTF-8 +encoding/test=UTF-8 diff --git a/api/.settings/org.eclipse.core.resources.prefs b/api/.settings/org.eclipse.core.resources.prefs index c2e657a753b..7a531392842 100644 --- a/api/.settings/org.eclipse.core.resources.prefs +++ b/api/.settings/org.eclipse.core.resources.prefs @@ -1,3 +1,3 @@ -#Mon Aug 27 14:48:15 PDT 2012 eclipse.preferences.version=1 encoding/=UTF-8 +encoding/src=UTF-8 diff --git a/awsapi/.classpath b/awsapi/.classpath index c5e598f9f43..6c4d1ea6865 100644 --- a/awsapi/.classpath +++ b/awsapi/.classpath @@ -1,68 +1,21 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + - - + + + + + + + + + + + diff --git a/awsapi/.settings/org.eclipse.core.resources.prefs b/awsapi/.settings/org.eclipse.core.resources.prefs index 99f26c0203a..7a531392842 100644 --- a/awsapi/.settings/org.eclipse.core.resources.prefs +++ b/awsapi/.settings/org.eclipse.core.resources.prefs @@ -1,2 +1,3 @@ eclipse.preferences.version=1 encoding/=UTF-8 +encoding/src=UTF-8 diff --git a/awsapi/pom.xml b/awsapi/pom.xml index 4ead0cdeead..d981d60c2d8 100644 --- a/awsapi/pom.xml +++ b/awsapi/pom.xml @@ -260,5 +260,40 @@ --> + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + + org.apache.maven.plugins + + + maven-dependency-plugin + + + [2.5.1,) + + + copy-dependencies + + + + + + + + + + + + diff --git a/console-proxy/.classpath b/console-proxy/.classpath old mode 100644 new mode 100755 index eeed44e009b..3a64a8bcc67 --- a/console-proxy/.classpath +++ b/console-proxy/.classpath @@ -1,25 +1,44 @@ - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/console-proxy/.project b/console-proxy/.project old mode 100644 new mode 100755 index 5fae244dad4..c5072483a73 --- a/console-proxy/.project +++ b/console-proxy/.project @@ -1,41 +1,28 @@ - - console-proxy - + cloud-console-proxy + CloudStack is an IaaS (“Infrastracture as a Service”) cloud orchestration platform. NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse. + cloud-core + cloud-api + cloud-utils + xapi + cloud-agent - - org.eclipse.wst.jsdt.core.javascriptValidator - - - org.eclipse.jdt.core.javabuilder + + org.eclipse.m2e.core.maven2Builder + + + + org.eclipse.m2e.core.maven2Nature org.eclipse.jdt.core.javanature - org.eclipse.wst.jsdt.core.jsNature diff --git a/console-proxy/.settings/org.eclipse.core.resources.prefs b/console-proxy/.settings/org.eclipse.core.resources.prefs index 99f26c0203a..dfb46eb81ef 100644 --- a/console-proxy/.settings/org.eclipse.core.resources.prefs +++ b/console-proxy/.settings/org.eclipse.core.resources.prefs @@ -1,2 +1,4 @@ eclipse.preferences.version=1 encoding/=UTF-8 +encoding/certs=UTF-8 +encoding/src=UTF-8 diff --git a/console-proxy/pom.xml b/console-proxy/pom.xml index 8bfb75363f5..1820578cec6 100644 --- a/console-proxy/pom.xml +++ b/console-proxy/pom.xml @@ -63,11 +63,12 @@ cloud-utils ${project.version} - + install diff --git a/framework/ipc/src/org/apache/cloudstack/framework/ipc/ResultHandler.java b/framework/ipc/src/org/apache/cloudstack/framework/ipc/ResultHandler.java new file mode 100755 index 00000000000..5c5c1c82abd --- /dev/null +++ b/framework/ipc/src/org/apache/cloudstack/framework/ipc/ResultHandler.java @@ -0,0 +1,37 @@ +/* + * 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.framework.ipc; + +/** + * Handles results of the ipc call + * + */ +public interface ResultHandler { + + /** + * Signals a successful result + */ + void signalSuccess(); + + /** + * Signals an error result + * @param e exception thrown + */ + void signalError(Exception e); +} diff --git a/framework/ipc/src/org/apache/cloudstack/framework/ipc/Ipc.java b/framework/ipc/src/org/apache/cloudstack/framework/ipc/Signal.java similarity index 97% rename from framework/ipc/src/org/apache/cloudstack/framework/ipc/Ipc.java rename to framework/ipc/src/org/apache/cloudstack/framework/ipc/Signal.java index 85c9df0a4bb..1011eaa9d42 100755 --- a/framework/ipc/src/org/apache/cloudstack/framework/ipc/Ipc.java +++ b/framework/ipc/src/org/apache/cloudstack/framework/ipc/Signal.java @@ -28,7 +28,7 @@ import java.lang.annotation.Target; */ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.METHOD) -public @interface Ipc { +public @interface Signal { String topic(); String responseTopic(); diff --git a/framework/ipc/src/org/apache/cloudstack/framework/ipc/IpcIntercepter.java b/framework/ipc/src/org/apache/cloudstack/framework/ipc/SignalIntercepter.java similarity index 96% rename from framework/ipc/src/org/apache/cloudstack/framework/ipc/IpcIntercepter.java rename to framework/ipc/src/org/apache/cloudstack/framework/ipc/SignalIntercepter.java index 82c2a473a11..e0e739cd22d 100755 --- a/framework/ipc/src/org/apache/cloudstack/framework/ipc/IpcIntercepter.java +++ b/framework/ipc/src/org/apache/cloudstack/framework/ipc/SignalIntercepter.java @@ -18,6 +18,6 @@ */ package org.apache.cloudstack.framework.ipc; -public class IpcIntercepter { +public class SignalIntercepter { } diff --git a/platform/compute/pom.xml b/platform/compute/pom.xml index 23bd8e74c47..5dce0d4ef46 100644 --- a/platform/compute/pom.xml +++ b/platform/compute/pom.xml @@ -1,11 +1,11 @@ 4.0.0 - cloudstack + org.apache.cloudstack cloud-platform-compute 0.0.1-SNAPSHOT - cloudstack + org.apache.cloudstack cloud-framework-ipc 0.0.1-SNAPSHOT