diff --git a/awsapi/pom.xml b/awsapi/pom.xml index 321f348f4c4..b23e78cf60b 100644 --- a/awsapi/pom.xml +++ b/awsapi/pom.xml @@ -93,6 +93,14 @@ install src + + + src + + **/*.java + + + + + 4.0.0 + cloud-client-ui + Apache CloudStack Client UI + war + + org.apache.cloudstack + cloudstack + 4.0.0-SNAPSHOT + + + + org.apache.cloudstack + cloud-server + ${project.version} + + + org.apache.cloudstack + cloud-plugin-user-authenticator-ldap + ${project.version} + + + org.apache.cloudstack + cloud-plugin-user-authenticator-md5 + ${project.version} + + + org.apache.cloudstack + cloud-plugin-user-authenticator-plaintext + ${project.version} + + + org.apache.cloudstack + cloud-plugin-network-nvp + ${project.version} + + + org.apache.cloudstack + cloud-plugin-network-ovs + ${project.version} + + + org.apache.cloudstack + cloud-plugin-network-elb + ${project.version} + + + org.apache.cloudstack + cloud-plugin-hypervisor-xen + ${project.version} + + + org.apache.cloudstack + cloud-plugin-hypervisor-ovm + ${project.version} + + + org.apache.cloudstack + cloud-plugin-storage-allocator-random + ${project.version} + + + org.apache.cloudstack + cloud-plugin-planner-user-dispersing + ${project.version} + + + org.apache.cloudstack + cloud-plugin-planner-user-concentrated-pod + ${project.version} + + + org.apache.cloudstack + cloud-plugin-host-allocator-random + ${project.version} + + + mysql + mysql-connector-java + 5.1.21 + runtime + + + + org.apache.cloudstack + cloud-plugin-hypervisor-vmware + ${project.version} + + + org.apache.cloudstack + cloud-plugin-network-srx + ${project.version} + + + org.apache.cloudstack + cloud-plugin-hypervisor-kvm + ${project.version} + + + org.apache.cloudstack + cloud-plugin-netapp + ${project.version} + + + org.apache.cloudstack + cloud-plugin-network-f5 + ${project.version} + + + org.apache.cloudstack + cloud-plugin-network-netscaler + ${project.version} + + + + install + + + org.apache.maven.plugins + maven-war-plugin + 2.2 + + ./WEB-INF/web.xml + ./target/generated-webapp + + + + org.mortbay.jetty + maven-jetty-plugin + 6.1.26 + + + + 8080 + 60000 + + + /client + ./WEB-INF/web.xml + ./target/generated-webapp + + + + maven-antrun-plugin + 1.7 + + + generate-resources + + run + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + + org.apache.maven.plugins + + + maven-antrun-plugin + + [1.7,) + + run + + + + + + + + + + + + + + diff --git a/console-proxy/pom.xml b/console-proxy/pom.xml index 052bd5a48ce..5a42c2c57bb 100644 --- a/console-proxy/pom.xml +++ b/console-proxy/pom.xml @@ -46,5 +46,13 @@ install src + + + certs + + realhostip.csr + + + diff --git a/deps/install-non-oss.sh b/deps/install-non-oss.sh new file mode 100755 index 00000000000..8f4a63dc2c2 --- /dev/null +++ b/deps/install-non-oss.sh @@ -0,0 +1,10 @@ +#!/bin/sh + +mvn install:install-file -Dfile=cloud-iControl.jar -DgroupId=com.cloud.com.f5 -DartifactId=icontrol -Dversion=1.0 -Dpackaging=jar +mvn install:install-file -Dfile=cloud-netscaler.jar -DgroupId=com.cloud.com.citrix -DartifactId=netscaler -Dversion=1.0 -Dpackaging=jar +mvn install:install-file -Dfile=cloud-netscaler-sdx.jar -DgroupId=com.cloud.com.citrix -DartifactId=netscaler-sdx -Dversion=1.0 -Dpackaging=jar +mvn install:install-file -Dfile=cloud-manageontap.jar -DgroupId=com.cloud.com.netapp -DartifactId=manageontap -Dversion=1.0 -Dpackaging=jar +mvn install:install-file -Dfile=libvirt-0.4.8.jar -DgroupId=org.libvirt -DartifactId=libvirt -Dversion=0.4.8 -Dpackaging=jar +mvn install:install-file -Dfile=vmware-vim.jar -DgroupId=com.cloud.com.vmware -DartifactId=vmware-vim -Dversion=1.0 -Dpackaging=jar +mvn install:install-file -Dfile=vmware-vim25.jar -DgroupId=com.cloud.com.vmware -DartifactId=vmware-vim25 -Dversion=1.0 -Dpackaging=jar +mvn install:install-file -Dfile=vmware-apputils.jar -DgroupId=com.cloud.com.vmware -DartifactId=vmware-apputils -Dversion=1.0 -Dpackaging=jar diff --git a/m2-settings.xml b/m2-settings.xml deleted file mode 100644 index 3aa6285d6d4..00000000000 --- a/m2-settings.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - admin - central - - - admin - snapshots - - - - - - - - false - - repo1 - repo1 - http://repo.maven.apache.org/maven2 - - - - false - - central - libs-release - http://cs.ibuildthecloud.com/artifactory/libs-release - - - artifactory - - - - artifactory - - - diff --git a/plugins/pom.xml b/plugins/pom.xml index 14725df375a..2a6ca3168c7 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -34,18 +34,11 @@ deployment-planners/user-concentrated-pod deployment-planners/user-dispersing - file-systems/netapp host-allocators/random - hypervisors/kvm hypervisors/ovm - hypervisors/vmware hypervisors/xen network-elements/elastic-loadbalancer network-elements/ovs - network-elements/f5 - network-elements/juniper-srx - network-elements/midokura-midonet - network-elements/netscaler network-elements/nicira-nvp storage-allocators/random user-authenticators/ldap @@ -61,4 +54,73 @@ + + + netapp + + + nonoss + + + + file-systems/netapp + + + + kvm + + + nonoss + + + + hypervisors/kvm + + + + f5 + + + nonoss + + + + network-elements/f5 + + + + netscaler + + + nonoss + + + + network-elements/netscaler + + + + srx + + + nonoss + + + + network-elements/juniper-srx + + + + vmware + + + nonoss + + + + hypervisors/vmware + + + + diff --git a/plugins/storage-allocators/random/pom.xml b/plugins/storage-allocators/random/pom.xml index 15c927d6048..6cb60cdf7ff 100644 --- a/plugins/storage-allocators/random/pom.xml +++ b/plugins/storage-allocators/random/pom.xml @@ -23,7 +23,7 @@ Apache CloudStack Plugin - Storage Allocator Random org.apache.cloudstack - cloudstack + cloudstack-plugins 4.0.0-SNAPSHOT ../../pom.xml diff --git a/pom.xml b/pom.xml index de49d2ec198..21592c937dd 100644 --- a/pom.xml +++ b/pom.xml @@ -53,6 +53,9 @@ 1.6 1.6 1.8 + 3.2.1 + 1.1.1 + 0.5 3.0 4.10 1.46 @@ -75,6 +78,8 @@ 3.5.1-Final 2.0.4 2.4 + 1.2 + true @@ -202,19 +207,4 @@ - - - cloudstack-third-parties - libs-release - http://cs.ibuildthecloud.com/artifactory/libs-release - - true - - - false - - - - - diff --git a/server/pom.xml b/server/pom.xml index f8d7985d7da..3731f71bccb 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -59,11 +59,11 @@ mail ${cs.mail.version} - + + jstl + jstl + ${cs.jstl.version} + install diff --git a/server/src/com/cloud/maint/Version.java b/server/src/com/cloud/maint/Version.java index 184b9a6c952..73175474edc 100644 --- a/server/src/com/cloud/maint/Version.java +++ b/server/src/com/cloud/maint/Version.java @@ -47,7 +47,15 @@ public class Version { } public static String trimToPatch(String version) { + int index = version.indexOf("-"); + + if ( index > 0 ) + version = version.substring(0, index); + 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..24f6aeb07e3 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/utils/pom.xml b/utils/pom.xml index 4bab5f9b3bd..0124fdb4612 100644 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -34,7 +34,7 @@ cglib - cglib + cglib-nodep ${cs.cglib.version} @@ -63,6 +63,21 @@ commons-codec ${cs.codec.version} + + commons-collections + commons-collections + ${cs.collections.version} + + + commons-discovery + commons-discovery + ${cs.discovery.version} + + + commons-logging + commons-logging + ${cs.logging.version} + org.bouncycastle bcprov-jdk16 @@ -127,5 +142,10 @@ + + + certs + + 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)); }