You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ke...@apache.org on 2012/08/23 23:30:54 UTC
[1/40] git commit: Maven worksplace fixes/patches from Darren
Updated Branches:
refs/heads/maven [created] 9a51ff3bf
Maven worksplace fixes/patches from Darren
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/9a51ff3b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/9a51ff3b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/9a51ff3b
Branch: refs/heads/maven
Commit: 9a51ff3bfcd45c695f52e8a227c59b5d4a7ff6b8
Parents: 1f0cbc5
Author: Kelven Yang <ke...@citrix.com>
Authored: Thu Aug 23 14:20:01 2012 -0700
Committer: Kelven Yang <ke...@citrix.com>
Committed: Thu Aug 23 14:26:27 2012 -0700
----------------------------------------------------------------------
agent-simulator/.classpath | 39 ------
agent-simulator/.project | 35 -----
agent/.classpath | 50 ++++----
agent/.project | 64 ++++------
api/.classpath | 40 +++----
api/.project | 26 +---
awsapi/.classpath | 99 +++------------
awsapi/.project | 26 +----
build/.project | 29 -----
client/.classpath | 48 ++++----
client/.project | 64 ++++------
client/WEB-INF/web.xml | 7 -
console-proxy/.classpath | 45 +++----
console-proxy/.project | 64 ++++------
core/.classpath | 44 +++----
core/.project | 58 ++++-----
deps/.classpath | 68 ----------
deps/.project | 35 -----
ovm/.project | 23 ----
patches/.classpath | 6 -
patches/.project | 11 --
.../user-concentrated-pod/.classpath | 42 +++----
.../user-concentrated-pod/.project | 26 +---
.../deployment-planners/user-dispersing/.classpath | 42 +++----
.../deployment-planners/user-dispersing/.project | 26 +---
.../.settings/org.eclipse.jdt.core.prefs | 9 +-
plugins/file-systems/netapp/.classpath | 43 +++----
plugins/file-systems/netapp/.project | 26 +---
plugins/host-allocators/random/.classpath | 42 +++----
plugins/host-allocators/random/.project | 26 +---
plugins/hypervisors/kvm/.classpath | 43 +++----
plugins/hypervisors/kvm/.project | 26 +----
plugins/hypervisors/ovm/.classpath | 47 +++-----
plugins/hypervisors/ovm/.project | 26 +----
plugins/hypervisors/vmware/.classpath | 44 +++----
plugins/hypervisors/vmware/.project | 26 +----
plugins/hypervisors/xen/.classpath | 44 +++----
plugins/hypervisors/xen/.project | 26 +----
.../elastic-loadbalancer/.classpath | 43 +++----
.../network-elements/elastic-loadbalancer/.project | 26 +---
plugins/network-elements/f5/.classpath | 43 +++----
plugins/network-elements/f5/.project | 26 +---
plugins/network-elements/juniper-srx/.classpath | 43 +++----
plugins/network-elements/juniper-srx/.project | 26 +---
plugins/network-elements/netscaler/.classpath | 43 +++----
plugins/network-elements/netscaler/.project | 26 +---
plugins/network-elements/nicira-nvp/.classpath | 43 +++----
plugins/network-elements/nicira-nvp/.project | 52 +++-----
plugins/network-elements/ovs/.classpath | 43 +++----
plugins/network-elements/ovs/.project | 26 +---
plugins/storage-allocators/random/.classpath | 42 +++----
plugins/storage-allocators/random/.project | 26 +---
plugins/user-authenticators/ldap/.classpath | 42 +++----
plugins/user-authenticators/ldap/.project | 26 +---
plugins/user-authenticators/md5/.classpath | 42 +++----
plugins/user-authenticators/md5/.project | 26 +---
plugins/user-authenticators/plain-text/.classpath | 42 +++----
plugins/user-authenticators/plain-text/.project | 26 +---
scripts/.classpath | 24 ----
scripts/.project | 35 -----
server/.classpath | 52 +++-----
server/.project | 58 ++++-----
server/src/com/cloud/maint/Version.java | 4 +
.../src/com/cloud/server/ManagementServerImpl.java | 2 +-
.../cloud/upgrade/DatabaseIntegrityChecker.java | 4 +
.../com/cloud/upgrade/DatabaseUpgradeChecker.java | 3 +
server/src/com/cloud/vm/UserVmManagerImpl.java | 1 -
setup/.classpath | 23 ----
setup/.project | 35 -----
test/.classpath | 31 -----
test/.project | 37 ------
tools/.classpath | 53 --------
tools/.project | 41 ------
ui/.classpath | 23 ----
ui/.project | 35 -----
usage/.classpath | 49 +++-----
usage/.project | 58 ++++-----
utils/.classpath | 50 ++++----
utils/.project | 58 ++++-----
utils/src/com/cloud/utils/script/Script.java | 6 +
vmware-base/.classpath | 40 +++----
vmware-base/.project | 26 +---
82 files changed, 832 insertions(+), 2073 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9a51ff3b/agent-simulator/.classpath
----------------------------------------------------------------------
diff --git a/agent-simulator/.classpath b/agent-simulator/.classpath
deleted file mode 100644
index 0ca4c4a..0000000
--- a/agent-simulator/.classpath
+++ /dev/null
@@ -1,39 +0,0 @@
-<?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 kind="lib" path="/deps/cloud-log4j.jar"/>
- <classpathentry combineaccessrules="false" kind="src" path="/core"/>
- <classpathentry combineaccessrules="false" kind="src" path="/api"/>
- <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-proxy"/>
- <classpathentry combineaccessrules="false" kind="src" path="/deps"/>
- <classpathentry combineaccessrules="false" kind="src" path="/setup"/>
- <classpathentry combineaccessrules="false" kind="src" path="/test"/>
- <classpathentry combineaccessrules="false" kind="src" path="/tools"/>
- <classpathentry combineaccessrules="false" kind="src" path="/ui"/>
- <classpathentry combineaccessrules="false" kind="src" path="/usage"/>
- <classpathentry combineaccessrules="false" kind="src" path="/client"/>
- <classpathentry combineaccessrules="false" kind="src" path="/vmware-base"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9a51ff3b/agent-simulator/.project
----------------------------------------------------------------------
diff --git a/agent-simulator/.project b/agent-simulator/.project
deleted file mode 100644
index a51960f..0000000
--- a/agent-simulator/.project
+++ /dev/null
@@ -1,35 +0,0 @@
-<?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>agent-simulator</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9a51ff3b/agent/.classpath
----------------------------------------------------------------------
diff --git a/agent/.classpath b/agent/.classpath
index 6046323..619e2d1 100644
--- a/agent/.classpath
+++ b/agent/.classpath
@@ -1,30 +1,26 @@
<?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="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"/>
- <classpathentry combineaccessrules="false" kind="src" path="/core"/>
- <classpathentry combineaccessrules="false" kind="src" path="/api"/>
- <classpathentry combineaccessrules="false" kind="src" path="/tools"/>
- <classpathentry kind="output" path="bin"/>
+ <classpathentry kind="src" output="target/classes" path="src">
+ <attributes>
+ <attribute name="optional" value="true"/>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="src" output="target/test-classes" path="test">
+ <attributes>
+ <attribute name="optional" value="true"/>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
+ <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/9a51ff3b/agent/.project
----------------------------------------------------------------------
diff --git a/agent/.project b/agent/.project
index 8ee5c2a..7a274dd 100644
--- a/agent/.project
+++ b/agent/.project
@@ -1,41 +1,23 @@
-<?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>agent</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.python.pydev.PyDevBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.python.pydev.pythonNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>cloud-agent</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
+ </natures>
+</projectDescription>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9a51ff3b/api/.classpath
----------------------------------------------------------------------
diff --git a/api/.classpath b/api/.classpath
index f8a90fe..298eba2 100644
--- a/api/.classpath
+++ b/api/.classpath
@@ -1,26 +1,20 @@
<?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="/utils"/>
- <classpathentry combineaccessrules="false" kind="src" path="/deps"/>
- <classpathentry kind="output" path="bin"/>
+ <classpathentry kind="src" output="target/classes" path="src">
+ <attributes>
+ <attribute name="optional" value="true"/>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
+ <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/9a51ff3b/api/.project
----------------------------------------------------------------------
diff --git a/api/.project b/api/.project
index e70acd0..5101d6d 100644
--- a/api/.project
+++ b/api/.project
@@ -1,24 +1,6 @@
<?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>api</name>
+ <name>cloud-api</name>
<comment></comment>
<projects>
</projects>
@@ -28,8 +10,14 @@ under the License.
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
</natures>
</projectDescription>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9a51ff3b/awsapi/.classpath
----------------------------------------------------------------------
diff --git a/awsapi/.classpath b/awsapi/.classpath
index 4dc46c4..298eba2 100644
--- a/awsapi/.classpath
+++ b/awsapi/.classpath
@@ -1,85 +1,20 @@
<?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="src" path="test"/>
- <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/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"/>
+ <classpathentry kind="src" output="target/classes" path="src">
+ <attributes>
+ <attribute name="optional" value="true"/>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
+ <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/9a51ff3b/awsapi/.project
----------------------------------------------------------------------
diff --git a/awsapi/.project b/awsapi/.project
index 9ae990a..c7b4834 100644
--- a/awsapi/.project
+++ b/awsapi/.project
@@ -1,41 +1,23 @@
<?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>awsapi</name>
+ <name>cloud-awsapi</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
- <name>org.python.pydev.PyDevBuilder</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.jdt.core.javanature</nature>
- <nature>org.python.pydev.pythonNature</nature>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
</natures>
</projectDescription>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9a51ff3b/build/.project
----------------------------------------------------------------------
diff --git a/build/.project b/build/.project
deleted file mode 100644
index 7c021db..0000000
--- a/build/.project
+++ /dev/null
@@ -1,29 +0,0 @@
-<?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>build</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- </buildSpec>
- <natures>
- </natures>
-</projectDescription>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9a51ff3b/client/.classpath
----------------------------------------------------------------------
diff --git a/client/.classpath b/client/.classpath
index 32ebb22..fd7ad7f 100644
--- a/client/.classpath
+++ b/client/.classpath
@@ -1,28 +1,26 @@
<?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="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="JUNIT_HOME/junit.jar"/>
- <classpathentry combineaccessrules="false" kind="src" path="/agent"/>
- <classpathentry combineaccessrules="false" kind="src" path="/core"/>
- <classpathentry combineaccessrules="false" kind="src" path="/server"/>
- <classpathentry combineaccessrules="false" kind="src" path="/utils"/>
- <classpathentry kind="output" path="bin"/>
+ <classpathentry kind="src" output="target/classes" path="src/main/java">
+ <attributes>
+ <attribute name="optional" value="true"/>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="src" output="target/test-classes" path="src/test/java">
+ <attributes>
+ <attribute name="optional" value="true"/>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
+ <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/9a51ff3b/client/.project
----------------------------------------------------------------------
diff --git a/client/.project b/client/.project
index 7c8752f..a666016 100644
--- a/client/.project
+++ b/client/.project
@@ -1,41 +1,23 @@
-<?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>client</name>
- <comment>client project</comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.python.pydev.PyDevBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.python.pydev.pythonNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>cloud-client-ui</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
+ </natures>
+</projectDescription>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9a51ff3b/client/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/client/WEB-INF/web.xml b/client/WEB-INF/web.xml
index 7972024..41fad73 100644
--- a/client/WEB-INF/web.xml
+++ b/client/WEB-INF/web.xml
@@ -20,13 +20,6 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
version="2.5">
- <resource-ref>
- <description> DB Connection Pooling</description>
- <res-ref-name> jdbc/VmopsDB</res-ref-name>
- <res-type> javax.sql.DataSource</res-type>
- <res-auth> Container</res-auth>
- </resource-ref>
-
<servlet>
<servlet-name>cloudStartupServlet</servlet-name>
<servlet-class>com.cloud.servlet.CloudStartupServlet</servlet-class>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9a51ff3b/console-proxy/.classpath
----------------------------------------------------------------------
diff --git a/console-proxy/.classpath b/console-proxy/.classpath
index 1a61b02..298eba2 100644
--- a/console-proxy/.classpath
+++ b/console-proxy/.classpath
@@ -1,25 +1,20 @@
-<?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>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" output="target/classes" path="src">
+ <attributes>
+ <attribute name="optional" value="true"/>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
+ <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/9a51ff3b/console-proxy/.project
----------------------------------------------------------------------
diff --git a/console-proxy/.project b/console-proxy/.project
index d3efcb5..e036702 100644
--- a/console-proxy/.project
+++ b/console-proxy/.project
@@ -1,41 +1,23 @@
-<?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>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.wst.jsdt.core.jsNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>cloud-console-proxy</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
+ </natures>
+</projectDescription>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9a51ff3b/core/.classpath
----------------------------------------------------------------------
diff --git a/core/.classpath b/core/.classpath
index b345290..298eba2 100644
--- a/core/.classpath
+++ b/core/.classpath
@@ -1,30 +1,20 @@
<?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 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"/>
- <classpathentry combineaccessrules="false" kind="src" path="/api"/>
- <classpathentry combineaccessrules="false" kind="src" path="/tools"/>
- <classpathentry combineaccessrules="false" kind="src" path="/vmware-base"/>
- <classpathentry kind="output" path="bin"/>
+ <classpathentry kind="src" output="target/classes" path="src">
+ <attributes>
+ <attribute name="optional" value="true"/>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
+ <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/9a51ff3b/core/.project
----------------------------------------------------------------------
diff --git a/core/.project b/core/.project
index a6fbce3..6b72a42 100644
--- a/core/.project
+++ b/core/.project
@@ -1,35 +1,23 @@
-<?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>core</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>cloud-core</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
+ </natures>
+</projectDescription>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9a51ff3b/deps/.classpath
----------------------------------------------------------------------
diff --git a/deps/.classpath b/deps/.classpath
deleted file mode 100755
index 1376b4f..0000000
--- a/deps/.classpath
+++ /dev/null
@@ -1,68 +0,0 @@
-<?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="XenServerJava"/>
- <classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry exported="true" kind="lib" path="cloud-axis.jar"/>
- <classpathentry exported="true" kind="lib" path="cloud-backport-util-concurrent-3.0.jar"/>
- <classpathentry exported="true" kind="lib" path="cloud-bcprov-jdk16-1.45.jar"/>
- <classpathentry exported="true" kind="lib" path="cloud-cglib.jar"/>
- <classpathentry exported="true" kind="lib" path="cloud-commons-collections-3.2.1.jar"/>
- <classpathentry exported="true" kind="lib" path="cloud-commons-discovery.jar"/>
- <classpathentry exported="true" kind="lib" path="cloud-commons-logging-1.1.1.jar"/>
- <classpathentry exported="true" kind="lib" path="cloud-ehcache.jar"/>
- <classpathentry exported="true" kind="lib" path="cloud-email.jar"/>
- <classpathentry exported="true" kind="lib" path="cloud-httpcore-4.0.jar"/>
- <classpathentry exported="true" kind="lib" path="cloud-jasypt-1.8.jar"/>
- <classpathentry exported="true" kind="lib" path="cloud-jsch-0.1.42.jar"/>
- <classpathentry exported="true" kind="lib" path="cloud-jstl-1.2.jar"/>
- <classpathentry exported="true" kind="lib" path="libvirt-0.4.8.jar"/>
- <classpathentry exported="true" kind="lib" path="cloud-log4j.jar" sourcepath="/home/dev/thirdparty/apache-log4j-1.2.16/src/main/java"/>
- <classpathentry exported="true" kind="lib" path="cloud-mysql-connector-java-5.1.7-bin.jar"/>
- <classpathentry exported="true" kind="lib" path="cloud-servlet-api.jar"/>
- <classpathentry exported="true" kind="lib" path="cloud-trilead-ssh2-build213.jar"/>
- <classpathentry exported="true" kind="lib" path="cloud-ws-commons-util-1.0.2.jar"/>
- <classpathentry exported="true" kind="lib" path="cloud-wsdl4j.jar"/>
- <classpathentry exported="true" kind="lib" path="cloud-xenserver-5.6.100-1.jar"/>
- <classpathentry exported="true" kind="lib" path="cloud-xmlrpc-client-3.1.3.jar"/>
- <classpathentry exported="true" kind="lib" path="cloud-xmlrpc-common-3.1.3.jar"/>
- <classpathentry exported="true" kind="lib" path="cloud-xstream-1.3.1.jar"/>
- <classpathentry exported="true" kind="lib" path="jetty-6.1.26.jar"/>
- <classpathentry exported="true" kind="lib" path="jetty-util-6.1.26.jar"/>
- <classpathentry exported="true" kind="lib" path="cloud-log4j-extras.jar"/>
- <classpathentry exported="true" kind="lib" path="cloud-iControl.jar"/>
- <classpathentry exported="true" kind="lib" path="cloud-manageontap.jar"/>
- <classpathentry exported="true" kind="lib" path="vmware-apputils.jar"/>
- <classpathentry exported="true" kind="lib" path="vmware-lib-jaxrpc.jar"/>
- <classpathentry exported="true" kind="lib" path="vmware-vim.jar"/>
- <classpathentry exported="true" kind="lib" path="vmware-vim25.jar"/>
- <classpathentry exported="true" kind="lib" path="cloud-jnetpcap.jar"/>
- <classpathentry exported="true" kind="lib" path="cloud-junit.jar"/>
- <classpathentry exported="true" kind="lib" path="cloud-commons-codec-1.5.jar"/>
- <classpathentry exported="true" kind="lib" path="cloud-commons-dbcp-1.4.jar"/>
- <classpathentry exported="true" kind="lib" path="cloud-commons-pool-1.5.6.jar"/>
- <classpathentry exported="true" kind="lib" path="cloud-google-gson-1.7.1.jar"/>
- <classpathentry exported="true" kind="lib" path="cloud-commons-httpclient-3.1.jar"/>
- <classpathentry exported="true" kind="lib" path="cloud-netscaler.jar"/>
- <classpathentry exported="true" kind="lib" path="cloud-netscaler-sdx.jar"/>
- <classpathentry exported="true" kind="lib" path="cloud-commons-configuration-1.8.jar"/>
- <classpathentry exported="true" kind="lib" path="cloud-commons-lang-2.6.jar"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9a51ff3b/deps/.project
----------------------------------------------------------------------
diff --git a/deps/.project b/deps/.project
deleted file mode 100644
index 3420597..0000000
--- a/deps/.project
+++ /dev/null
@@ -1,35 +0,0 @@
-<?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>deps</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9a51ff3b/ovm/.project
----------------------------------------------------------------------
diff --git a/ovm/.project b/ovm/.project
deleted file mode 100644
index 6ef55a5..0000000
--- a/ovm/.project
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>ovm</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.python.pydev.PyDevBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.python.pydev.pythonNature</nature>
- </natures>
-</projectDescription>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9a51ff3b/patches/.classpath
----------------------------------------------------------------------
diff --git a/patches/.classpath b/patches/.classpath
deleted file mode 100644
index d171cd4..0000000
--- a/patches/.classpath
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9a51ff3b/patches/.project
----------------------------------------------------------------------
diff --git a/patches/.project b/patches/.project
deleted file mode 100644
index a53e4de..0000000
--- a/patches/.project
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>patches</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- </buildSpec>
- <natures>
- </natures>
-</projectDescription>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9a51ff3b/plugins/deployment-planners/user-concentrated-pod/.classpath
----------------------------------------------------------------------
diff --git a/plugins/deployment-planners/user-concentrated-pod/.classpath b/plugins/deployment-planners/user-concentrated-pod/.classpath
old mode 100755
new mode 100644
index 4cebd0e..298eba2
--- a/plugins/deployment-planners/user-concentrated-pod/.classpath
+++ b/plugins/deployment-planners/user-concentrated-pod/.classpath
@@ -1,28 +1,20 @@
<?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="/api"/>
- <classpathentry combineaccessrules="false" kind="src" path="/core"/>
- <classpathentry combineaccessrules="false" kind="src" path="/server"/>
- <classpathentry combineaccessrules="false" kind="src" path="/utils"/>
- <classpathentry kind="output" path="bin"/>
+ <classpathentry kind="src" output="target/classes" path="src">
+ <attributes>
+ <attribute name="optional" value="true"/>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
+ <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/9a51ff3b/plugins/deployment-planners/user-concentrated-pod/.project
----------------------------------------------------------------------
diff --git a/plugins/deployment-planners/user-concentrated-pod/.project b/plugins/deployment-planners/user-concentrated-pod/.project
old mode 100755
new mode 100644
index 2425800..e984070
--- a/plugins/deployment-planners/user-concentrated-pod/.project
+++ b/plugins/deployment-planners/user-concentrated-pod/.project
@@ -1,24 +1,6 @@
<?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>user-concentrated-pod-dp</name>
+ <name>cloud-plugin-planner-user-concentrated-pod</name>
<comment></comment>
<projects>
</projects>
@@ -28,8 +10,14 @@ under the License.
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
</natures>
</projectDescription>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9a51ff3b/plugins/deployment-planners/user-dispersing/.classpath
----------------------------------------------------------------------
diff --git a/plugins/deployment-planners/user-dispersing/.classpath b/plugins/deployment-planners/user-dispersing/.classpath
old mode 100755
new mode 100644
index 4cebd0e..298eba2
--- a/plugins/deployment-planners/user-dispersing/.classpath
+++ b/plugins/deployment-planners/user-dispersing/.classpath
@@ -1,28 +1,20 @@
<?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="/api"/>
- <classpathentry combineaccessrules="false" kind="src" path="/core"/>
- <classpathentry combineaccessrules="false" kind="src" path="/server"/>
- <classpathentry combineaccessrules="false" kind="src" path="/utils"/>
- <classpathentry kind="output" path="bin"/>
+ <classpathentry kind="src" output="target/classes" path="src">
+ <attributes>
+ <attribute name="optional" value="true"/>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
+ <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/9a51ff3b/plugins/deployment-planners/user-dispersing/.project
----------------------------------------------------------------------
diff --git a/plugins/deployment-planners/user-dispersing/.project b/plugins/deployment-planners/user-dispersing/.project
old mode 100755
new mode 100644
index adcef87..ff42ee4
--- a/plugins/deployment-planners/user-dispersing/.project
+++ b/plugins/deployment-planners/user-dispersing/.project
@@ -1,24 +1,6 @@
<?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>user-dispersing</name>
+ <name>cloud-plugin-planner-user-dispersing</name>
<comment></comment>
<projects>
</projects>
@@ -28,8 +10,14 @@ under the License.
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
</natures>
</projectDescription>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9a51ff3b/plugins/deployment-planners/user-dispersing/.settings/org.eclipse.jdt.core.prefs
----------------------------------------------------------------------
diff --git a/plugins/deployment-planners/user-dispersing/.settings/org.eclipse.jdt.core.prefs b/plugins/deployment-planners/user-dispersing/.settings/org.eclipse.jdt.core.prefs
index d0ee7df..2b2c869 100755
--- a/plugins/deployment-planners/user-dispersing/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/deployment-planners/user-dispersing/.settings/org.eclipse.jdt.core.prefs
@@ -1,12 +1,13 @@
-#Tue Jun 19 15:34:37 PDT 2012
+#Thu Aug 23 12:18:38 PDT 2012
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.6
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9a51ff3b/plugins/file-systems/netapp/.classpath
----------------------------------------------------------------------
diff --git a/plugins/file-systems/netapp/.classpath b/plugins/file-systems/netapp/.classpath
index 937d5c8..298eba2 100644
--- a/plugins/file-systems/netapp/.classpath
+++ b/plugins/file-systems/netapp/.classpath
@@ -1,29 +1,20 @@
<?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="/api"/>
- <classpathentry combineaccessrules="false" kind="src" path="/core"/>
- <classpathentry combineaccessrules="false" kind="src" path="/server"/>
- <classpathentry combineaccessrules="false" kind="src" path="/utils"/>
- <classpathentry combineaccessrules="false" kind="src" path="/deps"/>
- <classpathentry kind="output" path="bin"/>
+ <classpathentry kind="src" output="target/classes" path="src">
+ <attributes>
+ <attribute name="optional" value="true"/>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
+ <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/9a51ff3b/plugins/file-systems/netapp/.project
----------------------------------------------------------------------
diff --git a/plugins/file-systems/netapp/.project b/plugins/file-systems/netapp/.project
index 2db8d1d..9cd65bd 100644
--- a/plugins/file-systems/netapp/.project
+++ b/plugins/file-systems/netapp/.project
@@ -1,24 +1,6 @@
<?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>netapp</name>
+ <name>cloud-plugin-netapp</name>
<comment></comment>
<projects>
</projects>
@@ -28,8 +10,14 @@ under the License.
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
</natures>
</projectDescription>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9a51ff3b/plugins/host-allocators/random/.classpath
----------------------------------------------------------------------
diff --git a/plugins/host-allocators/random/.classpath b/plugins/host-allocators/random/.classpath
old mode 100755
new mode 100644
index 4cebd0e..298eba2
--- a/plugins/host-allocators/random/.classpath
+++ b/plugins/host-allocators/random/.classpath
@@ -1,28 +1,20 @@
<?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="/api"/>
- <classpathentry combineaccessrules="false" kind="src" path="/core"/>
- <classpathentry combineaccessrules="false" kind="src" path="/server"/>
- <classpathentry combineaccessrules="false" kind="src" path="/utils"/>
- <classpathentry kind="output" path="bin"/>
+ <classpathentry kind="src" output="target/classes" path="src">
+ <attributes>
+ <attribute name="optional" value="true"/>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
+ <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/9a51ff3b/plugins/host-allocators/random/.project
----------------------------------------------------------------------
diff --git a/plugins/host-allocators/random/.project b/plugins/host-allocators/random/.project
old mode 100755
new mode 100644
index 2a6c77d..02812b3
--- a/plugins/host-allocators/random/.project
+++ b/plugins/host-allocators/random/.project
@@ -1,24 +1,6 @@
<?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>random-host-allocator</name>
+ <name>cloud-plugin-host-allocator-random</name>
<comment></comment>
<projects>
</projects>
@@ -28,8 +10,14 @@ under the License.
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
</natures>
</projectDescription>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9a51ff3b/plugins/hypervisors/kvm/.classpath
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/.classpath b/plugins/hypervisors/kvm/.classpath
index 510d4f1..298eba2 100644
--- a/plugins/hypervisors/kvm/.classpath
+++ b/plugins/hypervisors/kvm/.classpath
@@ -1,29 +1,20 @@
<?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="/agent"/>
- <classpathentry combineaccessrules="false" kind="src" path="/utils"/>
- <classpathentry combineaccessrules="false" kind="src" path="/deps"/>
- <classpathentry combineaccessrules="false" kind="src" path="/api"/>
- <classpathentry combineaccessrules="false" kind="src" path="/core"/>
- <classpathentry kind="output" path="bin"/>
+ <classpathentry kind="src" output="target/classes" path="src">
+ <attributes>
+ <attribute name="optional" value="true"/>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
+ <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/9a51ff3b/plugins/hypervisors/kvm/.project
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/.project b/plugins/hypervisors/kvm/.project
old mode 100755
new mode 100644
index 2315ae1..c690a0e
--- a/plugins/hypervisors/kvm/.project
+++ b/plugins/hypervisors/kvm/.project
@@ -1,41 +1,23 @@
<?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>KVM</name>
+ <name>cloud-plugin-hypervisor-kvm</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
- <name>org.python.pydev.PyDevBuilder</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.jdt.core.javanature</nature>
- <nature>org.python.pydev.pythonNature</nature>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
</natures>
</projectDescription>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9a51ff3b/plugins/hypervisors/ovm/.classpath
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/ovm/.classpath b/plugins/hypervisors/ovm/.classpath
old mode 100755
new mode 100644
index 786e017..298eba2
--- a/plugins/hypervisors/ovm/.classpath
+++ b/plugins/hypervisors/ovm/.classpath
@@ -1,33 +1,20 @@
<?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="/core"/>
- <classpathentry combineaccessrules="false" kind="src" path="/utils"/>
- <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="/vmware-base"/>
- <classpathentry kind="src" path="/agent-simulator"/>
- <classpathentry combineaccessrules="false" kind="src" path="/agent"/>
- <classpathentry exported="true" kind="lib" path="/deps/cloud-xmlrpc-common-3.1.3.jar"/>
- <classpathentry kind="output" path="bin"/>
+ <classpathentry kind="src" output="target/classes" path="src">
+ <attributes>
+ <attribute name="optional" value="true"/>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
+ <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/9a51ff3b/plugins/hypervisors/ovm/.project
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/ovm/.project b/plugins/hypervisors/ovm/.project
old mode 100755
new mode 100644
index 429e8cc..694b349
--- a/plugins/hypervisors/ovm/.project
+++ b/plugins/hypervisors/ovm/.project
@@ -1,41 +1,23 @@
<?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>ovm</name>
+ <name>cloud-plugin-hypervisor-ovm</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
- <name>org.python.pydev.PyDevBuilder</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.jdt.core.javanature</nature>
- <nature>org.python.pydev.pythonNature</nature>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
</natures>
</projectDescription>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9a51ff3b/plugins/hypervisors/vmware/.classpath
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/vmware/.classpath b/plugins/hypervisors/vmware/.classpath
old mode 100755
new mode 100644
index 381b302..298eba2
--- a/plugins/hypervisors/vmware/.classpath
+++ b/plugins/hypervisors/vmware/.classpath
@@ -1,30 +1,20 @@
<?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="/core"/>
- <classpathentry combineaccessrules="false" kind="src" path="/utils"/>
- <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="/vmware-base"/>
- <classpathentry kind="output" path="bin"/>
+ <classpathentry kind="src" output="target/classes" path="src">
+ <attributes>
+ <attribute name="optional" value="true"/>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
+ <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/9a51ff3b/plugins/hypervisors/vmware/.project
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/vmware/.project b/plugins/hypervisors/vmware/.project
old mode 100755
new mode 100644
index 718ea77..ce9c179
--- a/plugins/hypervisors/vmware/.project
+++ b/plugins/hypervisors/vmware/.project
@@ -1,41 +1,23 @@
<?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>vmware</name>
+ <name>cloud-plugin-hypervisor-vmware</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
- <name>org.python.pydev.PyDevBuilder</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.jdt.core.javanature</nature>
- <nature>org.python.pydev.pythonNature</nature>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
</natures>
</projectDescription>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9a51ff3b/plugins/hypervisors/xen/.classpath
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xen/.classpath b/plugins/hypervisors/xen/.classpath
old mode 100755
new mode 100644
index a750247..298eba2
--- a/plugins/hypervisors/xen/.classpath
+++ b/plugins/hypervisors/xen/.classpath
@@ -1,30 +1,20 @@
<?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="/core"/>
- <classpathentry combineaccessrules="false" kind="src" path="/utils"/>
- <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"/>
+ <classpathentry kind="src" output="target/classes" path="src">
+ <attributes>
+ <attribute name="optional" value="true"/>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
+ <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/9a51ff3b/plugins/hypervisors/xen/.project
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xen/.project b/plugins/hypervisors/xen/.project
old mode 100755
new mode 100644
index 59a3509..456747c
--- a/plugins/hypervisors/xen/.project
+++ b/plugins/hypervisors/xen/.project
@@ -1,41 +1,23 @@
<?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>Xen</name>
+ <name>cloud-plugin-hypervisor-xen</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
- <name>org.python.pydev.PyDevBuilder</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.jdt.core.javanature</nature>
- <nature>org.python.pydev.pythonNature</nature>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
</natures>
</projectDescription>