incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alena1...@apache.org
Subject [9/61] [abbrv] git commit: CS-15875 resolved via patch from Andy Gross.
Date Tue, 07 Aug 2012 18:39:58 GMT
CS-15875 resolved via patch from Andy Gross.


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/81ff7a09
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/81ff7a09
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/81ff7a09

Branch: refs/heads/vpc
Commit: 81ff7a09fd2c53f58a9b4ba9a83e08bd5cc30ee3
Parents: 5fa300c
Author: Chip Childers <chip.childers@gmail.com>
Authored: Tue Aug 7 14:10:11 2012 -0400
Committer: Chip Childers <chip.childers@gmail.com>
Committed: Tue Aug 7 14:10:11 2012 -0400

----------------------------------------------------------------------
 agent-simulator/.classpath                     |    2 -
 awsapi/.classpath                              |  118 +++++++++---------
 core/.classpath                                |    2 +-
 plugins/hypervisors/xen/.classpath             |    1 +
 plugins/network-elements/nicira-nvp/.classpath |    1 -
 server/.classpath                              |    2 +-
 6 files changed, 62 insertions(+), 64 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/81ff7a09/agent-simulator/.classpath
----------------------------------------------------------------------
diff --git a/agent-simulator/.classpath b/agent-simulator/.classpath
index 24edf1b..0ca4c4a 100644
--- a/agent-simulator/.classpath
+++ b/agent-simulator/.classpath
@@ -26,9 +26,7 @@ under the License.
 	<classpathentry combineaccessrules="false" kind="src" path="/server"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/utils"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/agent"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/console"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/console-proxy"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/console-viewer"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/deps"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/setup"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/test"/>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/81ff7a09/awsapi/.classpath
----------------------------------------------------------------------
diff --git a/awsapi/.classpath b/awsapi/.classpath
index e814eae..4dc46c4 100644
--- a/awsapi/.classpath
+++ b/awsapi/.classpath
@@ -22,64 +22,64 @@ under the License.
 	<classpathentry kind="src" path="test"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/deps"/>
-	<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/antlr-2.7.6.jar"/>
-	<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/apache-log4j-extras-1.0.jar"/>
-	<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/axiom-api-1.2.8.jar"/>
-	<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/axiom-impl-1.2.8.jar"/>
-	<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/axis2-1.5.1.jar"/>
-	<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/axis2-adb-1.5.1.jar"/>
-	<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/axis2-ant-plugin-1.5.1.jar"/>
-	<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/axis2-jaxbri-1.5.1.jar"/>
-	<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/axis2-jaxws-1.5.1.jar"/>
-	<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/axis2-jibx-1.5.1.jar"/>
-	<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/axis2-json-1.5.1.jar"/>
-	<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/axis2-kernel-1.5.1.jar"/>
-	<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/axis2-transport-http-1.5.1.jar"/>
-	<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/axis2-transport-local-1.5.1.jar"/>
-	<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/cloud-gson.jar"/>
-	<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/commons-codec-1.4.jar"/>
-	<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/commons-collections-3.1.jar"/>
-	<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/commons-fileupload-1.2.jar"/>
-	<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/commons-httpclient-3.1.jar"/>
-	<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/commons-io-1.4.jar"/>
-	<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/commons-logging-1.1.1.jar"/>
-	<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/dom4j-1.6.1.jar"/>
-	<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/hibernate3.jar"/>
-	<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/httpcore-4.0.jar"/>
-	<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/javassist-3.9.0.GA.jar"/>
-	<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/jaxb-api-2.1.jar"/>
-	<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/jaxb-impl-2.1.7.jar"/>
-	<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/jaxb-xjc-2.1.7.jar"/>
-	<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/jsch-0.1.42.jar"/>
-	<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/json_simple-1.1.jar"/>
-	<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/jta-1.1.jar"/>
-	<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/junit-4.8.1.jar"/>
-	<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/log4j-1.2.15.jar"/>
-	<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/mail-1.4.jar"/>
-	<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/mysql-connector-java-5.1.7-bin.jar"/>
-	<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/neethi-2.0.4.jar"/>
-	<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/slf4j-api-1.5.11.jar"/>
-	<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/slf4j-jdk14-1.5.11.jar"/>
-	<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/woden-api-1.0M8.jar"/>
-	<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/woden-impl-dom-1.0M8.jar"/>
-	<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/xercesImpl.jar"/>
-	<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/xml-apis.jar"/>
-	<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/XmlSchema-1.4.3.jar"/>
-	<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/rampart-lib/bcprov-jdk16-145.jar"/>
-	<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/rampart-lib/commons-collections-3.1.jar"/>
-	<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/rampart-lib/joda-time-1.5.2.jar"/>
-	<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/rampart-lib/opensaml-1.1.jar"/>
-	<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/rampart-lib/opensaml-2.2.3.jar"/>
-	<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/rampart-lib/openws-1.2.2.jar"/>
-	<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/rampart-lib/rampart-core-1.5.jar"/>
-	<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/rampart-lib/rampart-policy-1.5.jar"/>
-	<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/rampart-lib/rampart-trust-1.5.jar"/>
-	<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/rampart-lib/slf4j-api-1.5.11.jar"/>
-	<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/rampart-lib/slf4j-jdk14-1.5.11.jar"/>
-	<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/rampart-lib/velocity-1.5.jar"/>
-	<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/rampart-lib/wss4j-1.5.8.jar"/>
-	<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/rampart-lib/xmlsec-1.4.2.jar"/>
-	<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/rampart-lib/xmltooling-1.2.0.jar"/>
-	<classpathentry kind="lib" path="/Users/john1/qgit/deps/cloudbridge-lib/servlet-api.jar"/>
+	<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/hibernate3.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="output" path="bin"/>
 </classpath>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/81ff7a09/core/.classpath
----------------------------------------------------------------------
diff --git a/core/.classpath b/core/.classpath
index 281ee60..b345290 100644
--- a/core/.classpath
+++ b/core/.classpath
@@ -19,7 +19,7 @@ under the License.
 -->
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="test"/>
+	<classpathentry excluding="com/cloud/hypervisor/vmware/util/TestVmwareUtil.java" kind="src"
path="test"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/deps"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/utils"/>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/81ff7a09/plugins/hypervisors/xen/.classpath
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xen/.classpath b/plugins/hypervisors/xen/.classpath
index a1aa5dd..a750247 100755
--- a/plugins/hypervisors/xen/.classpath
+++ b/plugins/hypervisors/xen/.classpath
@@ -25,5 +25,6 @@ under the License.
 	<classpathentry combineaccessrules="false" kind="src" path="/server"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/api"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/deps"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/ovs"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/81ff7a09/plugins/network-elements/nicira-nvp/.classpath
----------------------------------------------------------------------
diff --git a/plugins/network-elements/nicira-nvp/.classpath b/plugins/network-elements/nicira-nvp/.classpath
index e02c2da..2905af1 100644
--- a/plugins/network-elements/nicira-nvp/.classpath
+++ b/plugins/network-elements/nicira-nvp/.classpath
@@ -19,7 +19,6 @@ under the License.
 -->
 <classpath>
     <classpathentry kind="src" path="src"/>
-    <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.6.0_31"/>
     <classpathentry combineaccessrules="false" kind="src" path="/agent"/>
     <classpathentry combineaccessrules="false" kind="src" path="/core"/>
     <classpathentry combineaccessrules="false" kind="src" path="/deps"/>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/81ff7a09/server/.classpath
----------------------------------------------------------------------
diff --git a/server/.classpath b/server/.classpath
index e134955..a0f42c7 100755
--- a/server/.classpath
+++ b/server/.classpath
@@ -19,7 +19,7 @@ under the License.
 -->
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="test"/>
+	<classpathentry excluding="com/cloud/agent/manager/ResourceManagerTest.java|com/cloud/network/dao/ElbVmMapDaoTest.java"
kind="src" path="test"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/utils"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/core"/>


Mime
View raw message