Skip to content

Commit 81ff7a0

Browse files
chipchilderschipchilders
committed
CS-15875 resolved via patch from Andy Gross.
1 parent 5fa300c commit 81ff7a0

6 files changed

Lines changed: 62 additions & 64 deletions

File tree

‎agent-simulator/.classpath‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,7 @@ under the License.
2626
<classpathentry combineaccessrules="false" kind="src" path="/server"/>
2727
<classpathentry combineaccessrules="false" kind="src" path="/utils"/>
2828
<classpathentry combineaccessrules="false" kind="src" path="/agent"/>
29-
<classpathentry combineaccessrules="false" kind="src" path="/console"/>
3029
<classpathentry combineaccessrules="false" kind="src" path="/console-proxy"/>
31-
<classpathentry combineaccessrules="false" kind="src" path="/console-viewer"/>
3230
<classpathentry combineaccessrules="false" kind="src" path="/deps"/>
3331
<classpathentry combineaccessrules="false" kind="src" path="/setup"/>
3432
<classpathentry combineaccessrules="false" kind="src" path="/test"/>

‎awsapi/.classpath‎

Lines changed: 59 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -22,64 +22,64 @@ under the License.
2222
<classpathentry kind="src" path="test"/>
2323
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
2424
<classpathentry combineaccessrules="false" kind="src" path="/deps"/>
25-
<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/antlr-2.7.6.jar"/>
26-
<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/apache-log4j-extras-1.0.jar"/>
27-
<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/axiom-api-1.2.8.jar"/>
28-
<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/axiom-impl-1.2.8.jar"/>
29-
<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/axis2-1.5.1.jar"/>
30-
<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/axis2-adb-1.5.1.jar"/>
31-
<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/axis2-ant-plugin-1.5.1.jar"/>
32-
<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/axis2-jaxbri-1.5.1.jar"/>
33-
<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/axis2-jaxws-1.5.1.jar"/>
34-
<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/axis2-jibx-1.5.1.jar"/>
35-
<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/axis2-json-1.5.1.jar"/>
36-
<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/axis2-kernel-1.5.1.jar"/>
37-
<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/axis2-transport-http-1.5.1.jar"/>
38-
<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/axis2-transport-local-1.5.1.jar"/>
39-
<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/cloud-gson.jar"/>
40-
<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/commons-codec-1.4.jar"/>
41-
<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/commons-collections-3.1.jar"/>
42-
<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/commons-fileupload-1.2.jar"/>
43-
<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/commons-httpclient-3.1.jar"/>
44-
<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/commons-io-1.4.jar"/>
45-
<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/commons-logging-1.1.1.jar"/>
46-
<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/dom4j-1.6.1.jar"/>
47-
<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/hibernate3.jar"/>
48-
<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/httpcore-4.0.jar"/>
49-
<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/javassist-3.9.0.GA.jar"/>
50-
<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/jaxb-api-2.1.jar"/>
51-
<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/jaxb-impl-2.1.7.jar"/>
52-
<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/jaxb-xjc-2.1.7.jar"/>
53-
<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/jsch-0.1.42.jar"/>
54-
<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/json_simple-1.1.jar"/>
55-
<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/jta-1.1.jar"/>
56-
<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/junit-4.8.1.jar"/>
57-
<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/log4j-1.2.15.jar"/>
58-
<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/mail-1.4.jar"/>
59-
<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/mysql-connector-java-5.1.7-bin.jar"/>
60-
<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/neethi-2.0.4.jar"/>
61-
<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/slf4j-api-1.5.11.jar"/>
62-
<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/slf4j-jdk14-1.5.11.jar"/>
63-
<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/woden-api-1.0M8.jar"/>
64-
<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/woden-impl-dom-1.0M8.jar"/>
65-
<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/xercesImpl.jar"/>
66-
<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/xml-apis.jar"/>
67-
<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/XmlSchema-1.4.3.jar"/>
68-
<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/rampart-lib/bcprov-jdk16-145.jar"/>
69-
<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/rampart-lib/commons-collections-3.1.jar"/>
70-
<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/rampart-lib/joda-time-1.5.2.jar"/>
71-
<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/rampart-lib/opensaml-1.1.jar"/>
72-
<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/rampart-lib/opensaml-2.2.3.jar"/>
73-
<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/rampart-lib/openws-1.2.2.jar"/>
74-
<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/rampart-lib/rampart-core-1.5.jar"/>
75-
<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/rampart-lib/rampart-policy-1.5.jar"/>
76-
<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/rampart-lib/rampart-trust-1.5.jar"/>
77-
<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/rampart-lib/slf4j-api-1.5.11.jar"/>
78-
<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/rampart-lib/slf4j-jdk14-1.5.11.jar"/>
79-
<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/rampart-lib/velocity-1.5.jar"/>
80-
<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/rampart-lib/wss4j-1.5.8.jar"/>
81-
<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/rampart-lib/xmlsec-1.4.2.jar"/>
82-
<classpathentry kind="lib" path="/Users/john1/qgit/deps/awsapi-lib/rampart-lib/xmltooling-1.2.0.jar"/>
83-
<classpathentry kind="lib" path="/Users/john1/qgit/deps/cloudbridge-lib/servlet-api.jar"/>
25+
<classpathentry kind="lib" path="/deps/awsapi-lib/antlr-2.7.6.jar"/>
26+
<classpathentry kind="lib" path="/deps/awsapi-lib/apache-log4j-extras-1.0.jar"/>
27+
<classpathentry kind="lib" path="/deps/awsapi-lib/axiom-api-1.2.8.jar"/>
28+
<classpathentry kind="lib" path="/deps/awsapi-lib/axiom-impl-1.2.8.jar"/>
29+
<classpathentry kind="lib" path="/deps/awsapi-lib/axis2-1.5.1.jar"/>
30+
<classpathentry kind="lib" path="/deps/awsapi-lib/axis2-adb-1.5.1.jar"/>
31+
<classpathentry kind="lib" path="/deps/awsapi-lib/axis2-ant-plugin-1.5.1.jar"/>
32+
<classpathentry kind="lib" path="/deps/awsapi-lib/axis2-jaxbri-1.5.1.jar"/>
33+
<classpathentry kind="lib" path="/deps/awsapi-lib/axis2-jaxws-1.5.1.jar"/>
34+
<classpathentry kind="lib" path="/deps/awsapi-lib/axis2-jibx-1.5.1.jar"/>
35+
<classpathentry kind="lib" path="/deps/awsapi-lib/axis2-json-1.5.1.jar"/>
36+
<classpathentry kind="lib" path="/deps/awsapi-lib/axis2-kernel-1.5.1.jar"/>
37+
<classpathentry kind="lib" path="/deps/awsapi-lib/axis2-transport-http-1.5.1.jar"/>
38+
<classpathentry kind="lib" path="/deps/awsapi-lib/axis2-transport-local-1.5.1.jar"/>
39+
<classpathentry kind="lib" path="/deps/awsapi-lib/cloud-gson.jar"/>
40+
<classpathentry kind="lib" path="/deps/awsapi-lib/commons-codec-1.4.jar"/>
41+
<classpathentry kind="lib" path="/deps/awsapi-lib/commons-collections-3.1.jar"/>
42+
<classpathentry kind="lib" path="/deps/awsapi-lib/commons-fileupload-1.2.jar"/>
43+
<classpathentry kind="lib" path="/deps/awsapi-lib/commons-httpclient-3.1.jar"/>
44+
<classpathentry kind="lib" path="/deps/awsapi-lib/commons-io-1.4.jar"/>
45+
<classpathentry kind="lib" path="/deps/awsapi-lib/commons-logging-1.1.1.jar"/>
46+
<classpathentry kind="lib" path="/deps/awsapi-lib/dom4j-1.6.1.jar"/>
47+
<classpathentry kind="lib" path="/deps/awsapi-lib/hibernate3.jar"/>
48+
<classpathentry kind="lib" path="/deps/awsapi-lib/httpcore-4.0.jar"/>
49+
<classpathentry kind="lib" path="/deps/awsapi-lib/javassist-3.9.0.GA.jar"/>
50+
<classpathentry kind="lib" path="/deps/awsapi-lib/jaxb-api-2.1.jar"/>
51+
<classpathentry kind="lib" path="/deps/awsapi-lib/jaxb-impl-2.1.7.jar"/>
52+
<classpathentry kind="lib" path="/deps/awsapi-lib/jaxb-xjc-2.1.7.jar"/>
53+
<classpathentry kind="lib" path="/deps/awsapi-lib/jsch-0.1.42.jar"/>
54+
<classpathentry kind="lib" path="/deps/awsapi-lib/json_simple-1.1.jar"/>
55+
<classpathentry kind="lib" path="/deps/awsapi-lib/jta-1.1.jar"/>
56+
<classpathentry kind="lib" path="/deps/awsapi-lib/junit-4.8.1.jar"/>
57+
<classpathentry kind="lib" path="/deps/awsapi-lib/log4j-1.2.15.jar"/>
58+
<classpathentry kind="lib" path="/deps/awsapi-lib/mail-1.4.jar"/>
59+
<classpathentry kind="lib" path="/deps/awsapi-lib/mysql-connector-java-5.1.7-bin.jar"/>
60+
<classpathentry kind="lib" path="/deps/awsapi-lib/neethi-2.0.4.jar"/>
61+
<classpathentry kind="lib" path="/deps/awsapi-lib/slf4j-api-1.5.11.jar"/>
62+
<classpathentry kind="lib" path="/deps/awsapi-lib/slf4j-jdk14-1.5.11.jar"/>
63+
<classpathentry kind="lib" path="/deps/awsapi-lib/woden-api-1.0M8.jar"/>
64+
<classpathentry kind="lib" path="/deps/awsapi-lib/woden-impl-dom-1.0M8.jar"/>
65+
<classpathentry kind="lib" path="/deps/awsapi-lib/xercesImpl.jar"/>
66+
<classpathentry kind="lib" path="/deps/awsapi-lib/xml-apis.jar"/>
67+
<classpathentry kind="lib" path="/deps/awsapi-lib/XmlSchema-1.4.3.jar"/>
68+
<classpathentry kind="lib" path="/deps/awsapi-lib/rampart-lib/bcprov-jdk16-145.jar"/>
69+
<classpathentry kind="lib" path="/deps/awsapi-lib/rampart-lib/commons-collections-3.1.jar"/>
70+
<classpathentry kind="lib" path="/deps/awsapi-lib/rampart-lib/joda-time-1.5.2.jar"/>
71+
<classpathentry kind="lib" path="/deps/awsapi-lib/rampart-lib/opensaml-1.1.jar"/>
72+
<classpathentry kind="lib" path="/deps/awsapi-lib/rampart-lib/opensaml-2.2.3.jar"/>
73+
<classpathentry kind="lib" path="/deps/awsapi-lib/rampart-lib/openws-1.2.2.jar"/>
74+
<classpathentry kind="lib" path="/deps/awsapi-lib/rampart-lib/rampart-core-1.5.jar"/>
75+
<classpathentry kind="lib" path="/deps/awsapi-lib/rampart-lib/rampart-policy-1.5.jar"/>
76+
<classpathentry kind="lib" path="/deps/awsapi-lib/rampart-lib/rampart-trust-1.5.jar"/>
77+
<classpathentry kind="lib" path="/deps/awsapi-lib/rampart-lib/slf4j-api-1.5.11.jar"/>
78+
<classpathentry kind="lib" path="/deps/awsapi-lib/rampart-lib/slf4j-jdk14-1.5.11.jar"/>
79+
<classpathentry kind="lib" path="/deps/awsapi-lib/rampart-lib/velocity-1.5.jar"/>
80+
<classpathentry kind="lib" path="/deps/awsapi-lib/rampart-lib/wss4j-1.5.8.jar"/>
81+
<classpathentry kind="lib" path="/deps/awsapi-lib/rampart-lib/xmlsec-1.4.2.jar"/>
82+
<classpathentry kind="lib" path="/deps/awsapi-lib/rampart-lib/xmltooling-1.2.0.jar"/>
83+
<classpathentry kind="lib" path="/deps/cloud-servlet-api.jar"/>
8484
<classpathentry kind="output" path="bin"/>
8585
</classpath>

‎core/.classpath‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ under the License.
1919
-->
2020
<classpath>
2121
<classpathentry kind="src" path="src"/>
22-
<classpathentry kind="src" path="test"/>
22+
<classpathentry excluding="com/cloud/hypervisor/vmware/util/TestVmwareUtil.java" kind="src" path="test"/>
2323
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
2424
<classpathentry combineaccessrules="false" kind="src" path="/deps"/>
2525
<classpathentry combineaccessrules="false" kind="src" path="/utils"/>

‎plugins/hypervisors/xen/.classpath‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,6 @@ under the License.
2525
<classpathentry combineaccessrules="false" kind="src" path="/server"/>
2626
<classpathentry combineaccessrules="false" kind="src" path="/api"/>
2727
<classpathentry combineaccessrules="false" kind="src" path="/deps"/>
28+
<classpathentry combineaccessrules="false" kind="src" path="/ovs"/>
2829
<classpathentry kind="output" path="bin"/>
2930
</classpath>

‎plugins/network-elements/nicira-nvp/.classpath‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ under the License.
1919
-->
2020
<classpath>
2121
<classpathentry kind="src" path="src"/>
22-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.6.0_31"/>
2322
<classpathentry combineaccessrules="false" kind="src" path="/agent"/>
2423
<classpathentry combineaccessrules="false" kind="src" path="/core"/>
2524
<classpathentry combineaccessrules="false" kind="src" path="/deps"/>

‎server/.classpath‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ under the License.
1919
-->
2020
<classpath>
2121
<classpathentry kind="src" path="src"/>
22-
<classpathentry kind="src" path="test"/>
22+
<classpathentry excluding="com/cloud/agent/manager/ResourceManagerTest.java|com/cloud/network/dao/ElbVmMapDaoTest.java" kind="src" path="test"/>
2323
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
2424
<classpathentry combineaccessrules="false" kind="src" path="/utils"/>
2525
<classpathentry combineaccessrules="false" kind="src" path="/core"/>

0 commit comments

Comments
 (0)