Updated Branches: refs/heads/javelin 87b3378cd -> 298d224f8
Added extra maven files Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/298d224f Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/298d224f Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/298d224f Branch: refs/heads/javelin Commit: 298d224f83fc28f305014107c6781f149a6a5120 Parents: 622526a Author: Alex Huang <[email protected]> Authored: Tue Sep 11 18:14:42 2012 -0700 Committer: Alex Huang <[email protected]> Committed: Tue Sep 11 18:14:42 2012 -0700 ---------------------------------------------------------------------- agent/.settings/org.eclipse.core.resources.prefs | 2 + api/.settings/org.eclipse.core.resources.prefs | 2 +- awsapi/.classpath | 81 +++------------ awsapi/.settings/org.eclipse.core.resources.prefs | 1 + awsapi/pom.xml | 35 ++++++ console-proxy/.classpath | 65 ++++++++---- console-proxy/.project | 33 ++---- .../.settings/org.eclipse.core.resources.prefs | 2 + console-proxy/pom.xml | 3 +- .../org/apache/cloudstack/framework/ipc/Ipc.java | 35 ------ .../cloudstack/framework/ipc/IpcIntercepter.java | 23 ---- .../cloudstack/framework/ipc/ResultHandler.java | 37 +++++++ .../apache/cloudstack/framework/ipc/Signal.java | 35 ++++++ .../framework/ipc/SignalIntercepter.java | 23 ++++ platform/compute/pom.xml | 4 +- 15 files changed, 209 insertions(+), 172 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/298d224f/agent/.settings/org.eclipse.core.resources.prefs ---------------------------------------------------------------------- diff --git a/agent/.settings/org.eclipse.core.resources.prefs b/agent/.settings/org.eclipse.core.resources.prefs index 99f26c0..104c8ec 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/<project>=UTF-8 +encoding/src=UTF-8 +encoding/test=UTF-8 http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/298d224f/api/.settings/org.eclipse.core.resources.prefs ---------------------------------------------------------------------- diff --git a/api/.settings/org.eclipse.core.resources.prefs b/api/.settings/org.eclipse.core.resources.prefs index c2e657a..7a53139 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/<project>=UTF-8 +encoding/src=UTF-8 http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/298d224f/awsapi/.classpath ---------------------------------------------------------------------- diff --git a/awsapi/.classpath b/awsapi/.classpath index c5e598f..6c4d1ea 100644 --- a/awsapi/.classpath +++ b/awsapi/.classpath @@ -1,68 +1,21 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="src"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry combineaccessrules="false" kind="src" path="/deps"/> - <classpathentry kind="lib" path="/deps/awsapi-lib/antlr-2.7.6.jar"/> - <classpathentry kind="lib" path="/deps/awsapi-lib/apache-log4j-extras-1.0.jar"/> - <classpathentry kind="lib" path="/deps/awsapi-lib/axiom-api-1.2.8.jar"/> - <classpathentry kind="lib" path="/deps/awsapi-lib/axiom-impl-1.2.8.jar"/> - <classpathentry kind="lib" path="/deps/awsapi-lib/axis2-1.5.1.jar"/> - <classpathentry kind="lib" path="/deps/awsapi-lib/axis2-adb-1.5.1.jar"/> - <classpathentry kind="lib" path="/deps/awsapi-lib/axis2-ant-plugin-1.5.1.jar"/> - <classpathentry kind="lib" path="/deps/awsapi-lib/axis2-jaxbri-1.5.1.jar"/> - <classpathentry kind="lib" path="/deps/awsapi-lib/axis2-jaxws-1.5.1.jar"/> - <classpathentry kind="lib" path="/deps/awsapi-lib/axis2-jibx-1.5.1.jar"/> - <classpathentry kind="lib" path="/deps/awsapi-lib/axis2-json-1.5.1.jar"/> - <classpathentry kind="lib" path="/deps/awsapi-lib/axis2-kernel-1.5.1.jar"/> - <classpathentry kind="lib" path="/deps/awsapi-lib/axis2-transport-http-1.5.1.jar"/> - <classpathentry kind="lib" path="/deps/awsapi-lib/axis2-transport-local-1.5.1.jar"/> - <classpathentry kind="lib" path="/deps/awsapi-lib/cloud-gson.jar"/> - <classpathentry kind="lib" path="/deps/awsapi-lib/commons-codec-1.4.jar"/> - <classpathentry kind="lib" path="/deps/awsapi-lib/commons-collections-3.1.jar"/> - <classpathentry kind="lib" path="/deps/awsapi-lib/commons-fileupload-1.2.jar"/> - <classpathentry kind="lib" path="/deps/awsapi-lib/commons-httpclient-3.1.jar"/> - <classpathentry kind="lib" path="/deps/awsapi-lib/commons-io-1.4.jar"/> - <classpathentry kind="lib" path="/deps/awsapi-lib/commons-logging-1.1.1.jar"/> - <classpathentry kind="lib" path="/deps/awsapi-lib/dom4j-1.6.1.jar"/> - <classpathentry kind="lib" path="/deps/awsapi-lib/httpcore-4.0.jar"/> - <classpathentry kind="lib" path="/deps/awsapi-lib/javassist-3.9.0.GA.jar"/> - <classpathentry kind="lib" path="/deps/awsapi-lib/jaxb-api-2.1.jar"/> - <classpathentry kind="lib" path="/deps/awsapi-lib/jaxb-impl-2.1.7.jar"/> - <classpathentry kind="lib" path="/deps/awsapi-lib/jaxb-xjc-2.1.7.jar"/> - <classpathentry kind="lib" path="/deps/awsapi-lib/jsch-0.1.42.jar"/> - <classpathentry kind="lib" path="/deps/awsapi-lib/json_simple-1.1.jar"/> - <classpathentry kind="lib" path="/deps/awsapi-lib/jta-1.1.jar"/> - <classpathentry kind="lib" path="/deps/awsapi-lib/junit-4.8.1.jar"/> - <classpathentry kind="lib" path="/deps/awsapi-lib/log4j-1.2.15.jar"/> - <classpathentry kind="lib" path="/deps/awsapi-lib/mail-1.4.jar"/> - <classpathentry kind="lib" path="/deps/awsapi-lib/mysql-connector-java-5.1.7-bin.jar"/> - <classpathentry kind="lib" path="/deps/awsapi-lib/neethi-2.0.4.jar"/> - <classpathentry kind="lib" path="/deps/awsapi-lib/slf4j-api-1.5.11.jar"/> - <classpathentry kind="lib" path="/deps/awsapi-lib/slf4j-jdk14-1.5.11.jar"/> - <classpathentry kind="lib" path="/deps/awsapi-lib/woden-api-1.0M8.jar"/> - <classpathentry kind="lib" path="/deps/awsapi-lib/woden-impl-dom-1.0M8.jar"/> - <classpathentry kind="lib" path="/deps/awsapi-lib/xercesImpl.jar"/> - <classpathentry kind="lib" path="/deps/awsapi-lib/xml-apis.jar"/> - <classpathentry kind="lib" path="/deps/awsapi-lib/XmlSchema-1.4.3.jar"/> - <classpathentry kind="lib" path="/deps/awsapi-lib/rampart-lib/bcprov-jdk16-145.jar"/> - <classpathentry kind="lib" path="/deps/awsapi-lib/rampart-lib/commons-collections-3.1.jar"/> - <classpathentry kind="lib" path="/deps/awsapi-lib/rampart-lib/joda-time-1.5.2.jar"/> - <classpathentry kind="lib" path="/deps/awsapi-lib/rampart-lib/opensaml-1.1.jar"/> - <classpathentry kind="lib" path="/deps/awsapi-lib/rampart-lib/opensaml-2.2.3.jar"/> - <classpathentry kind="lib" path="/deps/awsapi-lib/rampart-lib/openws-1.2.2.jar"/> - <classpathentry kind="lib" path="/deps/awsapi-lib/rampart-lib/rampart-core-1.5.jar"/> - <classpathentry kind="lib" path="/deps/awsapi-lib/rampart-lib/rampart-policy-1.5.jar"/> - <classpathentry kind="lib" path="/deps/awsapi-lib/rampart-lib/rampart-trust-1.5.jar"/> - <classpathentry kind="lib" path="/deps/awsapi-lib/rampart-lib/slf4j-api-1.5.11.jar"/> - <classpathentry kind="lib" path="/deps/awsapi-lib/rampart-lib/slf4j-jdk14-1.5.11.jar"/> - <classpathentry kind="lib" path="/deps/awsapi-lib/rampart-lib/velocity-1.5.jar"/> - <classpathentry kind="lib" path="/deps/awsapi-lib/rampart-lib/wss4j-1.5.8.jar"/> - <classpathentry kind="lib" path="/deps/awsapi-lib/rampart-lib/xmlsec-1.4.2.jar"/> - <classpathentry kind="lib" path="/deps/awsapi-lib/rampart-lib/xmltooling-1.2.0.jar"/> - <classpathentry kind="lib" path="/deps/cloud-servlet-api.jar"/> - <classpathentry kind="lib" path="/deps/cloud-javax.persistence-2.0.0.jar"/> + <classpathentry including="**/*.java" kind="src" output="target/classes" path="src"> + <attributes> + <attribute name="optional" value="true"/> + <attribute name="maven.pomderived" value="true"/> + </attributes> + </classpathentry> <classpathentry combineaccessrules="false" kind="src" path="/utils"/> - <classpathentry kind="lib" path="/deps/cloud-ehcache.jar"/> - <classpathentry kind="output" path="bin"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"> + <attributes> + <attribute name="maven.pomderived" value="true"/> + </attributes> + </classpathentry> + <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"> + <attributes> + <attribute name="maven.pomderived" value="true"/> + </attributes> + </classpathentry> + <classpathentry kind="output" path="target/classes"/> </classpath> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/298d224f/awsapi/.settings/org.eclipse.core.resources.prefs ---------------------------------------------------------------------- diff --git a/awsapi/.settings/org.eclipse.core.resources.prefs b/awsapi/.settings/org.eclipse.core.resources.prefs index 99f26c0..7a53139 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/<project>=UTF-8 +encoding/src=UTF-8 http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/298d224f/awsapi/pom.xml ---------------------------------------------------------------------- diff --git a/awsapi/pom.xml b/awsapi/pom.xml index 4ead0cd..d981d60 100644 --- a/awsapi/pom.xml +++ b/awsapi/pom.xml @@ -260,5 +260,40 @@ </plugin> </plugins> --> + <pluginManagement> + <plugins> + <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.--> + <plugin> + <groupId>org.eclipse.m2e</groupId> + <artifactId>lifecycle-mapping</artifactId> + <version>1.0.0</version> + <configuration> + <lifecycleMappingMetadata> + <pluginExecutions> + <pluginExecution> + <pluginExecutionFilter> + <groupId> + org.apache.maven.plugins + </groupId> + <artifactId> + maven-dependency-plugin + </artifactId> + <versionRange> + [2.5.1,) + </versionRange> + <goals> + <goal>copy-dependencies</goal> + </goals> + </pluginExecutionFilter> + <action> + <ignore></ignore> + </action> + </pluginExecution> + </pluginExecutions> + </lifecycleMappingMetadata> + </configuration> + </plugin> + </plugins> + </pluginManagement> </build> </project> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/298d224f/console-proxy/.classpath ---------------------------------------------------------------------- diff --git a/console-proxy/.classpath b/console-proxy/.classpath old mode 100644 new mode 100755 index eeed44e..3a64a8b --- a/console-proxy/.classpath +++ b/console-proxy/.classpath @@ -1,25 +1,44 @@ <?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 -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. ---> <classpath> - <classpathentry kind="src" path="src"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry combineaccessrules="false" kind="src" path="/deps"/> - <classpathentry kind="output" path="bin"/> -</classpath> + <classpathentry kind="src" path="src" including="**/*.java"/> + <classpathentry kind="src" path="certs" excluding="realhostip.csr|**/*.java"/> + <classpathentry kind="src" path="target/maven-shared-archive-resources" excluding="**/*.java"/> + <classpathentry kind="output" path="target/classes"/> + <classpathentry kind="var" path="M2_REPO/javax/ejb/ejb-api/3.0/ejb-api-3.0.jar"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.16/log4j-1.2.16.jar"/> + <classpathentry kind="var" path="M2_REPO/com/google/code/gson/gson/1.7.1/gson-1.7.1.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.6/commons-codec-1.6.jar"/> + <classpathentry kind="src" path="/cloud-core"/> + <classpathentry kind="src" path="/cloud-api"/> + <classpathentry kind="src" path="/cloud-utils"/> + <classpathentry kind="var" path="M2_REPO/cglib/cglib-nodep/2.2.2/cglib-nodep-2.2.2.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-dbcp/commons-dbcp/1.4/commons-dbcp-1.4.jar"/> + <classpathentry kind="var" path="M2_REPO/net/sf/ehcache/ehcache/1.5.0/ehcache-1.5.0.jar"/> + <classpathentry kind="var" path="M2_REPO/backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar"/> + <classpathentry kind="var" path="M2_REPO/net/sf/jsr107cache/jsr107cache/1.0/jsr107cache-1.0.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-pool/commons-pool/1.6/commons-pool-1.6.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-discovery/commons-discovery/0.5/commons-discovery-0.5.jar"/> + <classpathentry kind="var" path="M2_REPO/org/bouncycastle/bcprov-jdk16/1.46/bcprov-jdk16-1.46.jar"/> + <classpathentry kind="var" path="M2_REPO/com/jcraft/jsch/0.1.42/jsch-0.1.42.jar"/> + <classpathentry kind="var" path="M2_REPO/org/eclipse/persistence/javax.persistence/2.0.0/javax.persistence-2.0.0.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jasypt/jasypt/1.9.0/jasypt-1.9.0.jar"/> + <classpathentry kind="var" path="M2_REPO/com/trilead/trilead-ssh2/build213-svnkit-1.3-patch/trilead-ssh2-build213-svnkit-1.3-patch.jar"/> + <classpathentry kind="var" path="M2_REPO/log4j/apache-log4j-extras/1.1/apache-log4j-extras-1.1.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-configuration/commons-configuration/1.8/commons-configuration-1.8.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.6/commons-lang-2.6.jar"/> + <classpathentry kind="src" path="/xapi"/> + <classpathentry kind="var" path="M2_REPO/org/apache/xmlrpc/xmlrpc-client/3.1.3/xmlrpc-client-3.1.3.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/xmlrpc/xmlrpc-common/3.1.3/xmlrpc-common-3.1.3.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/ws/commons/util/ws-commons-util/1.0.2/ws-commons-util-1.0.2.jar"/> + <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar"/> + <classpathentry kind="src" path="/cloud-agent"/> + <classpathentry kind="var" path="M2_REPO/org/mortbay/jetty/jetty/6.1.26/jetty-6.1.26.jar"/> + <classpathentry kind="var" path="M2_REPO/org/mortbay/jetty/jetty-util/6.1.26/jetty-util-6.1.26.jar"/> + <classpathentry kind="var" path="M2_REPO/org/mortbay/jetty/servlet-api/2.5-20081211/servlet-api-2.5-20081211.jar"/> + <classpathentry kind="var" path="M2_REPO/junit/junit/4.10/junit-4.10.jar"/> + <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/> +</classpath> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/298d224f/console-proxy/.project ---------------------------------------------------------------------- diff --git a/console-proxy/.project b/console-proxy/.project old mode 100644 new mode 100755 index 5fae244..c507248 --- a/console-proxy/.project +++ b/console-proxy/.project @@ -1,41 +1,28 @@ <?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 -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. ---> <projectDescription> - <name>console-proxy</name> - <comment></comment> + <name>cloud-console-proxy</name> + <comment>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.</comment> <projects> + <project>cloud-core</project> + <project>cloud-api</project> + <project>cloud-utils</project> + <project>xapi</project> + <project>cloud-agent</project> </projects> <buildSpec> <buildCommand> - <name>org.eclipse.wst.jsdt.core.javascriptValidator</name> + <name>org.eclipse.jdt.core.javabuilder</name> <arguments> </arguments> </buildCommand> <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> + <name>org.eclipse.m2e.core.maven2Builder</name> <arguments> </arguments> </buildCommand> </buildSpec> <natures> + <nature>org.eclipse.m2e.core.maven2Nature</nature> <nature>org.eclipse.jdt.core.javanature</nature> - <nature>org.eclipse.wst.jsdt.core.jsNature</nature> </natures> </projectDescription> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/298d224f/console-proxy/.settings/org.eclipse.core.resources.prefs ---------------------------------------------------------------------- diff --git a/console-proxy/.settings/org.eclipse.core.resources.prefs b/console-proxy/.settings/org.eclipse.core.resources.prefs index 99f26c0..dfb46eb 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/<project>=UTF-8 +encoding/certs=UTF-8 +encoding/src=UTF-8 http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/298d224f/console-proxy/pom.xml ---------------------------------------------------------------------- diff --git a/console-proxy/pom.xml b/console-proxy/pom.xml index 8bfb753..1820578 100644 --- a/console-proxy/pom.xml +++ b/console-proxy/pom.xml @@ -63,11 +63,12 @@ <artifactId>cloud-utils</artifactId> <version>${project.version}</version> </dependency> - <dependency> + <!-- dependency> <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-patches</artifactId> <version>${project.version}</version> </dependency> + --> </dependencies> <build> <defaultGoal>install</defaultGoal> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/298d224f/framework/ipc/src/org/apache/cloudstack/framework/ipc/Ipc.java ---------------------------------------------------------------------- diff --git a/framework/ipc/src/org/apache/cloudstack/framework/ipc/Ipc.java b/framework/ipc/src/org/apache/cloudstack/framework/ipc/Ipc.java deleted file mode 100755 index 85c9df0..0000000 --- a/framework/ipc/src/org/apache/cloudstack/framework/ipc/Ipc.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * 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; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -/** - * Marks a method as an ipc mechanism - */ -@Retention(RetentionPolicy.RUNTIME) -@Target(ElementType.METHOD) -public @interface Ipc { - String topic(); - - String responseTopic(); -} http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/298d224f/framework/ipc/src/org/apache/cloudstack/framework/ipc/IpcIntercepter.java ---------------------------------------------------------------------- diff --git a/framework/ipc/src/org/apache/cloudstack/framework/ipc/IpcIntercepter.java b/framework/ipc/src/org/apache/cloudstack/framework/ipc/IpcIntercepter.java deleted file mode 100755 index 82c2a47..0000000 --- a/framework/ipc/src/org/apache/cloudstack/framework/ipc/IpcIntercepter.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * 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; - -public class IpcIntercepter { - -} http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/298d224f/framework/ipc/src/org/apache/cloudstack/framework/ipc/ResultHandler.java ---------------------------------------------------------------------- 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 0000000..5c5c1c8 --- /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); +} http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/298d224f/framework/ipc/src/org/apache/cloudstack/framework/ipc/Signal.java ---------------------------------------------------------------------- diff --git a/framework/ipc/src/org/apache/cloudstack/framework/ipc/Signal.java b/framework/ipc/src/org/apache/cloudstack/framework/ipc/Signal.java new file mode 100755 index 0000000..1011eaa --- /dev/null +++ b/framework/ipc/src/org/apache/cloudstack/framework/ipc/Signal.java @@ -0,0 +1,35 @@ +/* + * 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; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Marks a method as an ipc mechanism + */ +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.METHOD) +public @interface Signal { + String topic(); + + String responseTopic(); +} http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/298d224f/framework/ipc/src/org/apache/cloudstack/framework/ipc/SignalIntercepter.java ---------------------------------------------------------------------- diff --git a/framework/ipc/src/org/apache/cloudstack/framework/ipc/SignalIntercepter.java b/framework/ipc/src/org/apache/cloudstack/framework/ipc/SignalIntercepter.java new file mode 100755 index 0000000..e0e739c --- /dev/null +++ b/framework/ipc/src/org/apache/cloudstack/framework/ipc/SignalIntercepter.java @@ -0,0 +1,23 @@ +/* + * 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; + +public class SignalIntercepter { + +} http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/298d224f/platform/compute/pom.xml ---------------------------------------------------------------------- diff --git a/platform/compute/pom.xml b/platform/compute/pom.xml index 23bd8e7..5dce0d4 100644 --- a/platform/compute/pom.xml +++ b/platform/compute/pom.xml @@ -1,11 +1,11 @@ <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> - <groupId>cloudstack</groupId> + <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-platform-compute</artifactId> <version>0.0.1-SNAPSHOT</version> <dependencies> <dependency> - <groupId>cloudstack</groupId> + <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-framework-ipc</artifactId> <version>0.0.1-SNAPSHOT</version> </dependency>
