diff --git a/agent-simulator/.classpath b/agent-simulator/.classpath deleted file mode 100644 index 0ca4c4a8e9e..00000000000 --- a/agent-simulator/.classpath +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/agent-simulator/.project b/agent-simulator/.project deleted file mode 100644 index a51960fa4d9..00000000000 --- a/agent-simulator/.project +++ /dev/null @@ -1,35 +0,0 @@ - - - - agent-simulator - - - - - - org.eclipse.jdt.core.javabuilder - - - - - - org.eclipse.jdt.core.javanature - - diff --git a/agent/.classpath b/agent/.classpath index 6046323a95e..619e2d116c0 100644 --- a/agent/.classpath +++ b/agent/.classpath @@ -1,30 +1,26 @@ - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + diff --git a/agent/.project b/agent/.project index 8ee5c2aa6b9..7a274dde187 100644 --- a/agent/.project +++ b/agent/.project @@ -1,41 +1,23 @@ - - - - agent - - - - - - org.python.pydev.PyDevBuilder - - - - - org.eclipse.jdt.core.javabuilder - - - - - - org.eclipse.jdt.core.javanature - org.python.pydev.pythonNature - - + + + cloud-agent + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature + + diff --git a/api/.classpath b/api/.classpath index f8a90fe0f9c..298eba2cda9 100644 --- a/api/.classpath +++ b/api/.classpath @@ -1,26 +1,20 @@ - - - - - - + + + + + + + + + + + + + + + + + diff --git a/api/.project b/api/.project index e70acd07f1f..5101d6d76a2 100644 --- a/api/.project +++ b/api/.project @@ -1,24 +1,6 @@ - - api + cloud-api @@ -28,8 +10,14 @@ under the License. + + org.eclipse.m2e.core.maven2Builder + + + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature diff --git a/awsapi/.classpath b/awsapi/.classpath index 4dc46c4b1ec..298eba2cda9 100644 --- a/awsapi/.classpath +++ b/awsapi/.classpath @@ -1,85 +1,20 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/awsapi/.project b/awsapi/.project index 9ae990a1c4b..c7b48342c36 100644 --- a/awsapi/.project +++ b/awsapi/.project @@ -1,41 +1,23 @@ - - awsapi + cloud-awsapi - org.python.pydev.PyDevBuilder + org.eclipse.jdt.core.javabuilder - org.eclipse.jdt.core.javabuilder + org.eclipse.m2e.core.maven2Builder org.eclipse.jdt.core.javanature - org.python.pydev.pythonNature + org.eclipse.m2e.core.maven2Nature diff --git a/build/.project b/build/.project deleted file mode 100644 index 7c021dbdcbb..00000000000 --- a/build/.project +++ /dev/null @@ -1,29 +0,0 @@ - - - - build - - - - - - - - diff --git a/client/.classpath b/client/.classpath index 32ebb2295f4..fd7ad7fbda7 100644 --- a/client/.classpath +++ b/client/.classpath @@ -1,28 +1,26 @@ - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + diff --git a/client/.project b/client/.project index 7c8752f6f0c..a6660162226 100644 --- a/client/.project +++ b/client/.project @@ -1,41 +1,23 @@ - - - - client - client project - - - - - org.python.pydev.PyDevBuilder - - - - - org.eclipse.jdt.core.javabuilder - - - - - - org.eclipse.jdt.core.javanature - org.python.pydev.pythonNature - - + + + cloud-client-ui + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature + + diff --git a/client/WEB-INF/web.xml b/client/WEB-INF/web.xml index 7972024451e..41fad73a6e4 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"> - - DB Connection Pooling - jdbc/VmopsDB - javax.sql.DataSource - Container - - cloudStartupServlet com.cloud.servlet.CloudStartupServlet diff --git a/console-proxy/.classpath b/console-proxy/.classpath index 1a61b023647..298eba2cda9 100644 --- a/console-proxy/.classpath +++ b/console-proxy/.classpath @@ -1,25 +1,20 @@ - - - - - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/console-proxy/.project b/console-proxy/.project index d3efcb5b448..e0367021f96 100644 --- a/console-proxy/.project +++ b/console-proxy/.project @@ -1,41 +1,23 @@ - - - - console-proxy - - - - - - org.eclipse.wst.jsdt.core.javascriptValidator - - - - - org.eclipse.jdt.core.javabuilder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.wst.jsdt.core.jsNature - - + + + cloud-console-proxy + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature + + diff --git a/core/.classpath b/core/.classpath index b345290cf90..298eba2cda9 100644 --- a/core/.classpath +++ b/core/.classpath @@ -1,30 +1,20 @@ - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/core/.project b/core/.project index a6fbce3d362..6b72a42f8ad 100644 --- a/core/.project +++ b/core/.project @@ -1,35 +1,23 @@ - - - - core - - - - - - org.eclipse.jdt.core.javabuilder - - - - - - org.eclipse.jdt.core.javanature - - + + + cloud-core + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature + + diff --git a/deps/.classpath b/deps/.classpath deleted file mode 100755 index 1376b4fb907..00000000000 --- a/deps/.classpath +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/deps/.project b/deps/.project deleted file mode 100644 index 3420597719a..00000000000 --- a/deps/.project +++ /dev/null @@ -1,35 +0,0 @@ - - - - deps - - - - - - org.eclipse.jdt.core.javabuilder - - - - - - org.eclipse.jdt.core.javanature - - diff --git a/ovm/.project b/ovm/.project deleted file mode 100644 index 6ef55a50063..00000000000 --- a/ovm/.project +++ /dev/null @@ -1,23 +0,0 @@ - - - ovm - - - - - - org.python.pydev.PyDevBuilder - - - - - org.eclipse.jdt.core.javabuilder - - - - - - org.eclipse.jdt.core.javanature - org.python.pydev.pythonNature - - diff --git a/patches/.classpath b/patches/.classpath deleted file mode 100644 index d171cd4c123..00000000000 --- a/patches/.classpath +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/patches/.project b/patches/.project deleted file mode 100644 index a53e4de671b..00000000000 --- a/patches/.project +++ /dev/null @@ -1,11 +0,0 @@ - - - patches - - - - - - - - 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 4cebd0e5683..298eba2cda9 --- a/plugins/deployment-planners/user-concentrated-pod/.classpath +++ b/plugins/deployment-planners/user-concentrated-pod/.classpath @@ -1,28 +1,20 @@ - - - - - - - - + + + + + + + + + + + + + + + + + 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 24258005b08..e984070cfbf --- a/plugins/deployment-planners/user-concentrated-pod/.project +++ b/plugins/deployment-planners/user-concentrated-pod/.project @@ -1,24 +1,6 @@ - - user-concentrated-pod-dp + cloud-plugin-planner-user-concentrated-pod @@ -28,8 +10,14 @@ under the License. + + org.eclipse.m2e.core.maven2Builder + + + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature diff --git a/plugins/deployment-planners/user-dispersing/.classpath b/plugins/deployment-planners/user-dispersing/.classpath old mode 100755 new mode 100644 index 4cebd0e5683..298eba2cda9 --- a/plugins/deployment-planners/user-dispersing/.classpath +++ b/plugins/deployment-planners/user-dispersing/.classpath @@ -1,28 +1,20 @@ - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/plugins/deployment-planners/user-dispersing/.project b/plugins/deployment-planners/user-dispersing/.project old mode 100755 new mode 100644 index adcef874623..ff42ee4f9ea --- a/plugins/deployment-planners/user-dispersing/.project +++ b/plugins/deployment-planners/user-dispersing/.project @@ -1,24 +1,6 @@ - - user-dispersing + cloud-plugin-planner-user-dispersing @@ -28,8 +10,14 @@ under the License. + + org.eclipse.m2e.core.maven2Builder + + + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature 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 d0ee7df1827..2b2c869b520 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 diff --git a/plugins/file-systems/netapp/.classpath b/plugins/file-systems/netapp/.classpath index 937d5c8f04f..298eba2cda9 100644 --- a/plugins/file-systems/netapp/.classpath +++ b/plugins/file-systems/netapp/.classpath @@ -1,29 +1,20 @@ - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/plugins/file-systems/netapp/.project b/plugins/file-systems/netapp/.project index 2db8d1d9e96..9cd65bdc376 100644 --- a/plugins/file-systems/netapp/.project +++ b/plugins/file-systems/netapp/.project @@ -1,24 +1,6 @@ - - netapp + cloud-plugin-netapp @@ -28,8 +10,14 @@ under the License. + + org.eclipse.m2e.core.maven2Builder + + + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature diff --git a/plugins/host-allocators/random/.classpath b/plugins/host-allocators/random/.classpath old mode 100755 new mode 100644 index 4cebd0e5683..298eba2cda9 --- a/plugins/host-allocators/random/.classpath +++ b/plugins/host-allocators/random/.classpath @@ -1,28 +1,20 @@ - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/plugins/host-allocators/random/.project b/plugins/host-allocators/random/.project old mode 100755 new mode 100644 index 2a6c77d48c7..02812b3974a --- a/plugins/host-allocators/random/.project +++ b/plugins/host-allocators/random/.project @@ -1,24 +1,6 @@ - - random-host-allocator + cloud-plugin-host-allocator-random @@ -28,8 +10,14 @@ under the License. + + org.eclipse.m2e.core.maven2Builder + + + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature diff --git a/plugins/hypervisors/kvm/.classpath b/plugins/hypervisors/kvm/.classpath index 510d4f143bc..298eba2cda9 100644 --- a/plugins/hypervisors/kvm/.classpath +++ b/plugins/hypervisors/kvm/.classpath @@ -1,29 +1,20 @@ - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/plugins/hypervisors/kvm/.project b/plugins/hypervisors/kvm/.project old mode 100755 new mode 100644 index 2315ae12acf..c690a0e13a6 --- a/plugins/hypervisors/kvm/.project +++ b/plugins/hypervisors/kvm/.project @@ -1,41 +1,23 @@ - - KVM + cloud-plugin-hypervisor-kvm - org.python.pydev.PyDevBuilder + org.eclipse.jdt.core.javabuilder - org.eclipse.jdt.core.javabuilder + org.eclipse.m2e.core.maven2Builder org.eclipse.jdt.core.javanature - org.python.pydev.pythonNature + org.eclipse.m2e.core.maven2Nature diff --git a/plugins/hypervisors/ovm/.classpath b/plugins/hypervisors/ovm/.classpath old mode 100755 new mode 100644 index 786e0179c49..298eba2cda9 --- a/plugins/hypervisors/ovm/.classpath +++ b/plugins/hypervisors/ovm/.classpath @@ -1,33 +1,20 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/plugins/hypervisors/ovm/.project b/plugins/hypervisors/ovm/.project old mode 100755 new mode 100644 index 429e8ccde0b..694b349acea --- a/plugins/hypervisors/ovm/.project +++ b/plugins/hypervisors/ovm/.project @@ -1,41 +1,23 @@ - - ovm + cloud-plugin-hypervisor-ovm - org.python.pydev.PyDevBuilder + org.eclipse.jdt.core.javabuilder - org.eclipse.jdt.core.javabuilder + org.eclipse.m2e.core.maven2Builder org.eclipse.jdt.core.javanature - org.python.pydev.pythonNature + org.eclipse.m2e.core.maven2Nature diff --git a/plugins/hypervisors/vmware/.classpath b/plugins/hypervisors/vmware/.classpath old mode 100755 new mode 100644 index 381b30248d9..298eba2cda9 --- a/plugins/hypervisors/vmware/.classpath +++ b/plugins/hypervisors/vmware/.classpath @@ -1,30 +1,20 @@ - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/plugins/hypervisors/vmware/.project b/plugins/hypervisors/vmware/.project old mode 100755 new mode 100644 index 718ea77f0b2..ce9c1791b6c --- a/plugins/hypervisors/vmware/.project +++ b/plugins/hypervisors/vmware/.project @@ -1,41 +1,23 @@ - - vmware + cloud-plugin-hypervisor-vmware - org.python.pydev.PyDevBuilder + org.eclipse.jdt.core.javabuilder - org.eclipse.jdt.core.javabuilder + org.eclipse.m2e.core.maven2Builder org.eclipse.jdt.core.javanature - org.python.pydev.pythonNature + org.eclipse.m2e.core.maven2Nature diff --git a/plugins/hypervisors/xen/.classpath b/plugins/hypervisors/xen/.classpath old mode 100755 new mode 100644 index a7502472b3a..298eba2cda9 --- a/plugins/hypervisors/xen/.classpath +++ b/plugins/hypervisors/xen/.classpath @@ -1,30 +1,20 @@ - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/plugins/hypervisors/xen/.project b/plugins/hypervisors/xen/.project old mode 100755 new mode 100644 index 59a35093563..456747c0b6a --- a/plugins/hypervisors/xen/.project +++ b/plugins/hypervisors/xen/.project @@ -1,41 +1,23 @@ - - Xen + cloud-plugin-hypervisor-xen - org.python.pydev.PyDevBuilder + org.eclipse.jdt.core.javabuilder - org.eclipse.jdt.core.javabuilder + org.eclipse.m2e.core.maven2Builder org.eclipse.jdt.core.javanature - org.python.pydev.pythonNature + org.eclipse.m2e.core.maven2Nature diff --git a/plugins/network-elements/elastic-loadbalancer/.classpath b/plugins/network-elements/elastic-loadbalancer/.classpath index 937d5c8f04f..298eba2cda9 100644 --- a/plugins/network-elements/elastic-loadbalancer/.classpath +++ b/plugins/network-elements/elastic-loadbalancer/.classpath @@ -1,29 +1,20 @@ - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/plugins/network-elements/elastic-loadbalancer/.project b/plugins/network-elements/elastic-loadbalancer/.project index ce550c0f204..750ecbe827a 100644 --- a/plugins/network-elements/elastic-loadbalancer/.project +++ b/plugins/network-elements/elastic-loadbalancer/.project @@ -1,24 +1,6 @@ - - elastic-loadbalancer + cloud-plugin-network-elb @@ -28,8 +10,14 @@ under the License. + + org.eclipse.m2e.core.maven2Builder + + + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature diff --git a/plugins/network-elements/f5/.classpath b/plugins/network-elements/f5/.classpath index 937d5c8f04f..298eba2cda9 100644 --- a/plugins/network-elements/f5/.classpath +++ b/plugins/network-elements/f5/.classpath @@ -1,29 +1,20 @@ - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/plugins/network-elements/f5/.project b/plugins/network-elements/f5/.project index 74c254e4375..f4deca7077d 100644 --- a/plugins/network-elements/f5/.project +++ b/plugins/network-elements/f5/.project @@ -1,24 +1,6 @@ - - f5 + cloud-plugin-network-f5 @@ -28,8 +10,14 @@ under the License. + + org.eclipse.m2e.core.maven2Builder + + + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature diff --git a/plugins/network-elements/juniper-srx/.classpath b/plugins/network-elements/juniper-srx/.classpath index 937d5c8f04f..298eba2cda9 100644 --- a/plugins/network-elements/juniper-srx/.classpath +++ b/plugins/network-elements/juniper-srx/.classpath @@ -1,29 +1,20 @@ - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/plugins/network-elements/juniper-srx/.project b/plugins/network-elements/juniper-srx/.project index f28a0c0cb28..a1ccf7e5f88 100644 --- a/plugins/network-elements/juniper-srx/.project +++ b/plugins/network-elements/juniper-srx/.project @@ -1,24 +1,6 @@ - - srx + cloud-plugin-network-srx @@ -28,8 +10,14 @@ under the License. + + org.eclipse.m2e.core.maven2Builder + + + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature diff --git a/plugins/network-elements/netscaler/.classpath b/plugins/network-elements/netscaler/.classpath index 937d5c8f04f..298eba2cda9 100644 --- a/plugins/network-elements/netscaler/.classpath +++ b/plugins/network-elements/netscaler/.classpath @@ -1,29 +1,20 @@ - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/plugins/network-elements/netscaler/.project b/plugins/network-elements/netscaler/.project index 3900c39c2eb..6ab0a2a1a12 100644 --- a/plugins/network-elements/netscaler/.project +++ b/plugins/network-elements/netscaler/.project @@ -1,24 +1,6 @@ - - netscaler + cloud-plugin-network-netscaler @@ -28,8 +10,14 @@ under the License. + + org.eclipse.m2e.core.maven2Builder + + + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature diff --git a/plugins/network-elements/nicira-nvp/.classpath b/plugins/network-elements/nicira-nvp/.classpath index 2905af1416d..298eba2cda9 100644 --- a/plugins/network-elements/nicira-nvp/.classpath +++ b/plugins/network-elements/nicira-nvp/.classpath @@ -1,29 +1,20 @@ - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/plugins/network-elements/nicira-nvp/.project b/plugins/network-elements/nicira-nvp/.project index 962afeb78e9..15cd720f02e 100644 --- a/plugins/network-elements/nicira-nvp/.project +++ b/plugins/network-elements/nicira-nvp/.project @@ -1,35 +1,23 @@ - - nicira-nvp - - - - - - org.eclipse.jdt.core.javabuilder - - - - - - org.eclipse.jdt.core.javanature - + cloud-plugin-network-nvp + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature + diff --git a/plugins/network-elements/ovs/.classpath b/plugins/network-elements/ovs/.classpath index 937d5c8f04f..298eba2cda9 100644 --- a/plugins/network-elements/ovs/.classpath +++ b/plugins/network-elements/ovs/.classpath @@ -1,29 +1,20 @@ - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/plugins/network-elements/ovs/.project b/plugins/network-elements/ovs/.project index efb90d63f29..42b23ae7d63 100644 --- a/plugins/network-elements/ovs/.project +++ b/plugins/network-elements/ovs/.project @@ -1,24 +1,6 @@ - - ovs + cloud-plugin-network-ovs @@ -28,8 +10,14 @@ under the License. + + org.eclipse.m2e.core.maven2Builder + + + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature diff --git a/plugins/storage-allocators/random/.classpath b/plugins/storage-allocators/random/.classpath old mode 100755 new mode 100644 index 4cebd0e5683..298eba2cda9 --- a/plugins/storage-allocators/random/.classpath +++ b/plugins/storage-allocators/random/.classpath @@ -1,28 +1,20 @@ - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/plugins/storage-allocators/random/.project b/plugins/storage-allocators/random/.project old mode 100755 new mode 100644 index f578c264991..d3d0d83afe8 --- a/plugins/storage-allocators/random/.project +++ b/plugins/storage-allocators/random/.project @@ -1,24 +1,6 @@ - - random-storage-allocator + cloud-plugin-storage-allocator-random @@ -28,8 +10,14 @@ under the License. + + org.eclipse.m2e.core.maven2Builder + + + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature diff --git a/plugins/user-authenticators/ldap/.classpath b/plugins/user-authenticators/ldap/.classpath old mode 100755 new mode 100644 index 4cebd0e5683..298eba2cda9 --- a/plugins/user-authenticators/ldap/.classpath +++ b/plugins/user-authenticators/ldap/.classpath @@ -1,28 +1,20 @@ - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/plugins/user-authenticators/ldap/.project b/plugins/user-authenticators/ldap/.project old mode 100755 new mode 100644 index aa3405a24bb..0db5e797468 --- a/plugins/user-authenticators/ldap/.project +++ b/plugins/user-authenticators/ldap/.project @@ -1,24 +1,6 @@ - - ldap-user-authenticator + cloud-plugin-user-authenticator-ldap @@ -28,8 +10,14 @@ under the License. + + org.eclipse.m2e.core.maven2Builder + + + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature diff --git a/plugins/user-authenticators/md5/.classpath b/plugins/user-authenticators/md5/.classpath old mode 100755 new mode 100644 index 4cebd0e5683..298eba2cda9 --- a/plugins/user-authenticators/md5/.classpath +++ b/plugins/user-authenticators/md5/.classpath @@ -1,28 +1,20 @@ - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/plugins/user-authenticators/md5/.project b/plugins/user-authenticators/md5/.project old mode 100755 new mode 100644 index 2ac4a995436..cac426dbbb2 --- a/plugins/user-authenticators/md5/.project +++ b/plugins/user-authenticators/md5/.project @@ -1,24 +1,6 @@ - - md5-user-authenticator + cloud-plugin-user-authenticator-md5 @@ -28,8 +10,14 @@ under the License. + + org.eclipse.m2e.core.maven2Builder + + + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature diff --git a/plugins/user-authenticators/plain-text/.classpath b/plugins/user-authenticators/plain-text/.classpath old mode 100755 new mode 100644 index 4cebd0e5683..298eba2cda9 --- a/plugins/user-authenticators/plain-text/.classpath +++ b/plugins/user-authenticators/plain-text/.classpath @@ -1,28 +1,20 @@ - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/plugins/user-authenticators/plain-text/.project b/plugins/user-authenticators/plain-text/.project old mode 100755 new mode 100644 index 2972d8a2cce..de0daef5164 --- a/plugins/user-authenticators/plain-text/.project +++ b/plugins/user-authenticators/plain-text/.project @@ -1,24 +1,6 @@ - - plaintext-user-authenticator + cloud-plugin-user-authenticator-plaintext @@ -28,8 +10,14 @@ under the License. + + org.eclipse.m2e.core.maven2Builder + + + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature diff --git a/scripts/.classpath b/scripts/.classpath deleted file mode 100644 index fcab0e4b4e0..00000000000 --- a/scripts/.classpath +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - diff --git a/scripts/.project b/scripts/.project deleted file mode 100644 index cee435defd8..00000000000 --- a/scripts/.project +++ /dev/null @@ -1,35 +0,0 @@ - - - - scripts - - - - - - org.python.pydev.PyDevBuilder - - - - - - org.python.pydev.pythonNature - - diff --git a/server/.classpath b/server/.classpath old mode 100755 new mode 100644 index a0f42c77a6f..298eba2cda9 --- a/server/.classpath +++ b/server/.classpath @@ -1,32 +1,20 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/server/.project b/server/.project index bb146ff089b..4833869add9 100644 --- a/server/.project +++ b/server/.project @@ -1,35 +1,23 @@ - - - - server - - - - - - org.eclipse.jdt.core.javabuilder - - - - - - org.eclipse.jdt.core.javanature - - + + + cloud-server + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature + + diff --git a/server/src/com/cloud/maint/Version.java b/server/src/com/cloud/maint/Version.java index 184b9a6c952..083364f3047 100644 --- a/server/src/com/cloud/maint/Version.java +++ b/server/src/com/cloud/maint/Version.java @@ -48,6 +48,10 @@ public class Version { public static String trimToPatch(String version) { String[] tokens = version.split("[.]"); + + if ( tokens.length < 3 ) + return "0"; + return tokens[0] + "." + tokens[1]+ "." + tokens[2]; } diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java index 38734997b47..9cd2b487623 100755 --- a/server/src/com/cloud/server/ManagementServerImpl.java +++ b/server/src/com/cloud/server/ManagementServerImpl.java @@ -3165,7 +3165,7 @@ public class ManagementServerImpl implements ManagementServer { public String getVersion() { final Class c = ManagementServer.class; String fullVersion = c.getPackage().getImplementationVersion(); - if (fullVersion.length() > 0) { + if (fullVersion != null && fullVersion.length() > 0) { return fullVersion; } diff --git a/server/src/com/cloud/upgrade/DatabaseIntegrityChecker.java b/server/src/com/cloud/upgrade/DatabaseIntegrityChecker.java index 2d0ce5c0977..4688b3e617b 100755 --- a/server/src/com/cloud/upgrade/DatabaseIntegrityChecker.java +++ b/server/src/com/cloud/upgrade/DatabaseIntegrityChecker.java @@ -167,6 +167,10 @@ public class DatabaseIntegrityChecker implements SystemIntegrityChecker { txn.start(); try { String dbVersion = _dao.getCurrentVersion(); + + if ( dbVersion == null ) + return false; + if (Version.compare(Version.trimToPatch(dbVersion), Version.trimToPatch("2.2.8")) != 0) { return true; } diff --git a/server/src/com/cloud/upgrade/DatabaseUpgradeChecker.java b/server/src/com/cloud/upgrade/DatabaseUpgradeChecker.java index 4759746913b..047bb3eec21 100755 --- a/server/src/com/cloud/upgrade/DatabaseUpgradeChecker.java +++ b/server/src/com/cloud/upgrade/DatabaseUpgradeChecker.java @@ -334,6 +334,9 @@ public class DatabaseUpgradeChecker implements SystemIntegrityChecker { currentVersion = this.getClass().getSuperclass().getPackage().getImplementationVersion(); } + if ( currentVersion == null ) + return; + s_logger.info("DB version = " + dbVersion + " Code Version = " + currentVersion); if (Version.compare(Version.trimToPatch(dbVersion), Version.trimToPatch(currentVersion)) > 0) { diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java index 3af50a1d6c5..d7a1bd2387f 100755 --- a/server/src/com/cloud/vm/UserVmManagerImpl.java +++ b/server/src/com/cloud/vm/UserVmManagerImpl.java @@ -33,7 +33,6 @@ import javax.naming.ConfigurationException; import org.apache.commons.codec.binary.Base64; import org.apache.log4j.Logger; -import org.apache.tools.ant.taskdefs.Length.When; import com.cloud.acl.ControlledEntity.ACLType; import com.cloud.agent.AgentManager; diff --git a/setup/.classpath b/setup/.classpath deleted file mode 100644 index ff69d4c34d8..00000000000 --- a/setup/.classpath +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - diff --git a/setup/.project b/setup/.project deleted file mode 100644 index 23c6ad26241..00000000000 --- a/setup/.project +++ /dev/null @@ -1,35 +0,0 @@ - - - - setup - - - - - - org.eclipse.jdt.core.javabuilder - - - - - - org.eclipse.jdt.core.javanature - - diff --git a/test/.classpath b/test/.classpath deleted file mode 100644 index ab32fe0ef49..00000000000 --- a/test/.classpath +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - diff --git a/test/.project b/test/.project deleted file mode 100644 index 416fa2c58f5..00000000000 --- a/test/.project +++ /dev/null @@ -1,37 +0,0 @@ - - - - test - - - thirdparty - utils - - - - org.eclipse.jdt.core.javabuilder - - - - - - org.eclipse.jdt.core.javanature - - diff --git a/tools/.classpath b/tools/.classpath deleted file mode 100644 index 41f021f8832..00000000000 --- a/tools/.classpath +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tools/.project b/tools/.project deleted file mode 100644 index 1b4001f226e..00000000000 --- a/tools/.project +++ /dev/null @@ -1,41 +0,0 @@ - - - - tools - - - - - - org.python.pydev.PyDevBuilder - - - - - org.eclipse.jdt.core.javabuilder - - - - - - org.eclipse.jdt.core.javanature - org.python.pydev.pythonNature - - diff --git a/ui/.classpath b/ui/.classpath deleted file mode 100644 index 46dcd3e0e4e..00000000000 --- a/ui/.classpath +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - diff --git a/ui/.project b/ui/.project deleted file mode 100644 index 476a569d450..00000000000 --- a/ui/.project +++ /dev/null @@ -1,35 +0,0 @@ - - - - ui - - - - - - org.eclipse.jdt.core.javabuilder - - - - - - org.eclipse.jdt.core.javanature - - diff --git a/usage/.classpath b/usage/.classpath index b50ad1e2bd1..298eba2cda9 100644 --- a/usage/.classpath +++ b/usage/.classpath @@ -1,29 +1,20 @@ - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/usage/.project b/usage/.project index 8626fd8a2ef..cf40b981e58 100644 --- a/usage/.project +++ b/usage/.project @@ -1,35 +1,23 @@ - - - - usage - - - - - - org.eclipse.jdt.core.javabuilder - - - - - - org.eclipse.jdt.core.javanature - - + + + cloud-usage + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature + + diff --git a/utils/.classpath b/utils/.classpath index 54008168b5a..619e2d116c0 100644 --- a/utils/.classpath +++ b/utils/.classpath @@ -1,30 +1,26 @@ - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + diff --git a/utils/.project b/utils/.project index 3c00c9dd799..f81263ae36f 100644 --- a/utils/.project +++ b/utils/.project @@ -1,35 +1,23 @@ - - - - utils - - - - - - org.eclipse.jdt.core.javabuilder - - - - - - org.eclipse.jdt.core.javanature - - + + + cloud-utils + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature + + diff --git a/utils/src/com/cloud/utils/script/Script.java b/utils/src/com/cloud/utils/script/Script.java index a9b48b452d0..0662e612607 100755 --- a/utils/src/com/cloud/utils/script/Script.java +++ b/utils/src/com/cloud/utils/script/Script.java @@ -343,6 +343,12 @@ public class Script implements Callable { return file.getAbsolutePath(); } + url = Script.class.getClassLoader().getResource(path); + if (url != null) { + file = new File(url.getFile()); + return file.getAbsolutePath(); + } + if (path.endsWith(File.separator)) { path = path.substring(0, path.lastIndexOf(File.separator)); } diff --git a/vmware-base/.classpath b/vmware-base/.classpath index 589e125ff79..298eba2cda9 100644 --- a/vmware-base/.classpath +++ b/vmware-base/.classpath @@ -1,26 +1,20 @@ - - - - - - + + + + + + + + + + + + + + + + + diff --git a/vmware-base/.project b/vmware-base/.project index 9f7d21d795e..0ed2ec81c03 100644 --- a/vmware-base/.project +++ b/vmware-base/.project @@ -1,24 +1,6 @@ - - vmware-base + cloud-vmware-base @@ -28,8 +10,14 @@ under the License. + + org.eclipse.m2e.core.maven2Builder + + + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature