From 404e69490adcf89518d7bd23a4cd7f891984464d Mon Sep 17 00:00:00 2001 From: frank Date: Mon, 2 Apr 2012 19:29:38 -0700 Subject: [PATCH] replace cloud.com with CloudStack in text --- README.html | 1 - .../cloud/api/commands/RegisterIsoCmd.java | 2 +- .../api/commands/RegisterTemplateCmd.java | 2 +- build.xml | 4 +- build/build-cloud.xml | 2 +- build/cloud.properties | 4 +- build/developer.xml | 5 +- build/package.xml | 2 - client/tomcatconf/db.properties.in | 6 +- cloud-cli/cloudapis/cloud.py | 2 +- debian/changelog | 14 +-- debian/control | 92 +++++++++---------- docs/2.0/downloads.html | 2 +- docs/2.2/downloads-supp3.html | 2 +- python/lib/cloud_utils.py | 3 +- .../hypervisor/vmware/VmwareManagerImpl.java | 2 +- .../upgrade/DatabaseIntegrityChecker.java | 4 +- setup/apidoc/generatecommand.xsl | 2 +- setup/bindir/cloud-setup-databases.in | 2 +- tools/migration/10to21Upgrade.txt | 2 +- ui/old/test/index.html | 2 +- utils/conf/db.properties | 4 +- .../com/cloud/utils/encoding/URLEncoder.java | 10 +- .../javax/persistence/CollectionTable.java | 17 ---- .../javax/persistence/ElementCollection.java | 17 ---- .../vmware/mo/VmwareHypervisorHost.java | 2 +- 26 files changed, 81 insertions(+), 126 deletions(-) diff --git a/README.html b/README.html index 1bae956d580..3dd965b6b3f 100644 --- a/README.html +++ b/README.html @@ -6,7 +6,6 @@ diff --git a/api/src/com/cloud/api/commands/RegisterIsoCmd.java b/api/src/com/cloud/api/commands/RegisterIsoCmd.java index 47365e558c1..318ad23e013 100755 --- a/api/src/com/cloud/api/commands/RegisterIsoCmd.java +++ b/api/src/com/cloud/api/commands/RegisterIsoCmd.java @@ -36,7 +36,7 @@ import com.cloud.template.VirtualMachineTemplate; import com.cloud.user.Account; import com.cloud.user.UserContext; -@Implementation(responseObject=TemplateResponse.class, description="Registers an existing ISO into the Cloud.com Cloud.") +@Implementation(responseObject=TemplateResponse.class, description="Registers an existing ISO into the CloudStack Cloud.") public class RegisterIsoCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(RegisterIsoCmd.class.getName()); diff --git a/api/src/com/cloud/api/commands/RegisterTemplateCmd.java b/api/src/com/cloud/api/commands/RegisterTemplateCmd.java index dc4a2be7045..b2633b40499 100755 --- a/api/src/com/cloud/api/commands/RegisterTemplateCmd.java +++ b/api/src/com/cloud/api/commands/RegisterTemplateCmd.java @@ -38,7 +38,7 @@ import com.cloud.exception.ResourceAllocationException; import com.cloud.template.VirtualMachineTemplate; import com.cloud.user.UserContext; -@Implementation(description="Registers an existing template into the Cloud.com cloud. ", responseObject=TemplateResponse.class) +@Implementation(description="Registers an existing template into the CloudStack cloud. ", responseObject=TemplateResponse.class) public class RegisterTemplateCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(RegisterTemplateCmd.class.getName()); diff --git a/build.xml b/build.xml index c6712e42be3..9753213c23b 100755 --- a/build.xml +++ b/build.xml @@ -1,7 +1,7 @@ - + This is the overall dispatch file. It includes other build files but doesnot provide targets of its own. Do not modify @@ -9,7 +9,7 @@ developer.xml. - + diff --git a/build/build-cloud.xml b/build/build-cloud.xml index 40e4111fd71..53374565ce4 100755 --- a/build/build-cloud.xml +++ b/build/build-cloud.xml @@ -525,7 +525,7 @@ - + diff --git a/build/cloud.properties b/build/cloud.properties index 58d58049325..6ae34ec44c7 100755 --- a/build/cloud.properties +++ b/build/cloud.properties @@ -9,6 +9,6 @@ svn.revision=2 # copyright year company.copyright.year=2008-2011 -company.url=http://www.cloud.com +company.url=http://cloudstack.org company.license.name=GPL -company.name=Cloud.com Inc. +company.name=CloudStack diff --git a/build/developer.xml b/build/developer.xml index b740cd08249..b6a353a654e 100755 --- a/build/developer.xml +++ b/build/developer.xml @@ -1,14 +1,13 @@ - - + This is a developer.xml with tools to start and stop tomcat and generally developer targets that has nothing to do with compiling. - + diff --git a/build/package.xml b/build/package.xml index da9e73cca02..a4ba509c591 100755 --- a/build/package.xml +++ b/build/package.xml @@ -1,7 +1,5 @@ - - This is a package.xml with tools to package the cloud stack distribution diff --git a/client/tomcatconf/db.properties.in b/client/tomcatconf/db.properties.in index 698ce41270a..0460bad4a70 100644 --- a/client/tomcatconf/db.properties.in +++ b/client/tomcatconf/db.properties.in @@ -3,14 +3,14 @@ cluster.node.IP=127.0.0.1 cluster.servlet.port=9090 -# Cloud.com database settings +# CloudStack database settings db.cloud.username=@DBUSER@ db.cloud.password=@DBPW@ db.cloud.host=@DBHOST@ db.cloud.port=3306 db.cloud.name=cloud -# Cloud.com database tuning parameters +# CloudStack database tuning parameters db.cloud.maxActive=250 db.cloud.maxIdle=30 db.cloud.maxWait=10000 @@ -26,7 +26,7 @@ db.cloud.logAbandoned=true db.cloud.poolPreparedStatements=false db.cloud.url.params=prepStmtCacheSize=517&cachePrepStmts=true -# Cloud.com database SSL settings +# CloudStack database SSL settings db.cloud.useSSL=false db.cloud.keyStore= db.cloud.keyStorePassword= diff --git a/cloud-cli/cloudapis/cloud.py b/cloud-cli/cloudapis/cloud.py index 4d9cd014fe4..9125f2f7da7 100644 --- a/cloud-cli/cloudapis/cloud.py +++ b/cloud-cli/cloudapis/cloud.py @@ -17,7 +17,7 @@ # -'''Implements the Cloud.com API''' +'''Implements the CloudStack API''' from cloudtool.utils import describe diff --git a/debian/changelog b/debian/changelog index ea21e492d14..72698351b20 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,43 +6,43 @@ cloud (2.2.2) unstable; urgency=low cloud (2.1.97) unstable; urgency=low - * Bumping version number for next Cloud.com release + * Bumping version number for next CloudStack release -- Rudd-O Sat, 31 Jul 2010 19:09:54 -0700 cloud (2.0.97) unstable; urgency=low - * Bumping version number for next Cloud.com release + * Bumping version number for next CloudStack release -- Rudd-O Mon, 12 Jul 2010 14:01:41 -0700 cloud (2.0.2) unstable; urgency=low - * Bumping version number for next Cloud.com release + * Bumping version number for next CloudStack release -- Rudd-O Fri, 2 Jul 2010 19:55:41 -0700 cloud (2.0.0) unstable; urgency=low - * Bumping version number for next Cloud.com release + * Bumping version number for next CloudStack release -- Rudd-O Tue, 15 Jun 2010 12:10:05 -0700 cloud (1.9.14) unstable; urgency=low - * Bumping version number for next Cloud.com release + * Bumping version number for next CloudStack release -- Rudd-O Tue, 11 May 2010 14:46:14 -0700 cloud (1.9.12) unstable; urgency=low - * Bumping version number for Cloud.com RC4 release + * Bumping version number for CloudStack RC4 release -- Rudd-O Mon, 3 May 2010 14:46:14 -0700 cloud (1.9.11) unstable; urgency=low - * Bumping version number for Cloud.com release + * Bumping version number for CloudStack release -- Rudd-O Fri, 30 Apr 2010 15:08:38 -0700 diff --git a/debian/control b/debian/control index 99f496a6303..1d3ffe886ed 100644 --- a/debian/control +++ b/debian/control @@ -12,9 +12,9 @@ Conflicts: vmops-deps Replaces: vmops-deps Architecture: any Depends: openjdk-6-jre, cloud-agent-deps -Description: Cloud.com library dependencies +Description: CloudStack library dependencies This package contains a number of third-party dependencies - not shipped by distributions, required to run the Cloud.com + not shipped by distributions, required to run the CloudStack Cloud Stack. Package: cloud-agent-deps @@ -23,9 +23,9 @@ Conflicts: cloud-agent-deps Replaces: cloud-agent-deps Architecture: any Depends: openjdk-6-jre -Description: Cloud.com agent library dependencies +Description: CloudStack agent library dependencies This package contains a number of third-party dependencies - not shipped by distributions, required to run the Cloud.com + not shipped by distributions, required to run the CloudStack Cloud Stack. @@ -35,9 +35,9 @@ Conflicts: vmops-utils Replaces: vmops-utils Architecture: any Depends: openjdk-6-jre, python -Description: Cloud.com utility library - The Cloud.com utility libraries provide a set of Java classes used - in the Cloud.com Cloud Stack. +Description: CloudStack utility library + The CloudStack utility libraries provide a set of Java classes used + in the CloudStack Cloud Stack. Package: cloud-client-ui Provides: vmops-client-ui @@ -45,11 +45,11 @@ Conflicts: vmops-client-ui Replaces: vmops-client-ui Architecture: any Depends: openjdk-6-jre, cloud-client (= ${source:Version}) -Description: Cloud.com management server UI - The Cloud.com management server is the central point of coordination, - management, and intelligence in the Cloud.com Cloud Stack. This package +Description: CloudStack management server UI + The CloudStack management server is the central point of coordination, + management, and intelligence in the CloudStack Cloud Stack. This package is a requirement of the cloud-client package, which installs the - Cloud.com management server. + CloudStack management server. Package: cloud-server Provides: vmops-server @@ -57,9 +57,9 @@ Conflicts: vmops-server Replaces: vmops-server Architecture: any Depends: openjdk-6-jre, cloud-utils (= ${source:Version}), cloud-core (= ${source:Version}), cloud-deps (= ${source:Version}), libservlet2.5-java -Description: Cloud.com server library - The Cloud.com server libraries provide a set of Java classes used - in the Cloud.com Cloud Stack. +Description: CloudStack server library + The CloudStack server libraries provide a set of Java classes used + in the CloudStack Cloud Stack. Package: cloud-agent-scripts Provides: vmops-agent-scripts, vmops-console, cloud-console, vmops-console-proxy @@ -67,10 +67,10 @@ Conflicts: vmops-agent-scripts, vmops-console, cloud-console, vmops-console-prox Replaces: vmops-agent-scripts, vmops-console, cloud-console, vmops-console-proxy Architecture: any Depends: openjdk-6-jre, python, bash, bzip2, gzip, unzip, nfs-common, openssh-client -Description: Cloud.com agent scripts - The Cloud.com agent is in charge of managing shared computing resources in - a Cloud.com Cloud Stack-powered cloud. Install this package if this computer - will participate in your cloud -- this is a requirement for the Cloud.com +Description: CloudStack agent scripts + The CloudStack agent is in charge of managing shared computing resources in + a CloudStack Cloud Stack-powered cloud. Install this package if this computer + will participate in your cloud -- this is a requirement for the CloudStack agent. Package: cloud-daemonize @@ -78,9 +78,9 @@ Provides: vmops-daemonize Conflicts: vmops-daemonize Replaces: vmops-daemonize Architecture: any -Description: Cloud.com daemonization utility +Description: CloudStack daemonization utility This package contains a program that daemonizes the specified - process. The Cloud.com Cloud Stack uses this to start the agent + process. The CloudStack Cloud Stack uses this to start the agent as a service. Package: cloud-core @@ -89,9 +89,9 @@ Conflicts: vmops-core Replaces: vmops-core Architecture: any Depends: openjdk-6-jre, cloud-utils (= ${source:Version}) -Description: Cloud.com core library - The Cloud.com core libraries provide a set of Java classes used - in the Cloud.com Cloud Stack. +Description: CloudStack core library + The CloudStack core libraries provide a set of Java classes used + in the CloudStack Cloud Stack. Package: cloud-test Provides: vmops-test @@ -99,9 +99,9 @@ Conflicts: vmops-test Replaces: vmops-test Architecture: any Depends: openjdk-6-jre, wget, cloud-utils (= ${source:Version}), cloud-deps (= ${source:Version}) -Description: Cloud.com test suite - The Cloud.com test package contains a suite of automated tests - that the very much appreciated QA team at Cloud.com constantly +Description: CloudStack test suite + The CloudStack test package contains a suite of automated tests + that the very much appreciated QA team at CloudStack constantly uses to help increase the quality of the Cloud Stack. Package: cloud-client @@ -110,9 +110,9 @@ Conflicts: vmops-client Replaces: vmops-client Architecture: any Depends: openjdk-6-jre, cloud-deps (= ${source:Version}), cloud-utils (= ${source:Version}), cloud-server (= ${source:Version}), cloud-client-ui (= ${source:Version}), cloud-setup (= ${source:Version}), cloud-agent-scripts (= ${source:Version}), cloud-python (= ${source:Version}), tomcat6, libws-commons-util-java, libcommons-dbcp-java, libcommons-collections-java, libcommons-httpclient-java, sysvinit-utils, chkconfig, sudo, jsvc, python-mysqldb, python-paramiko, augeas-tools, genisoimage, cloud-system-iso -Description: Cloud.com client - The Cloud.com management server is the central point of coordination, - management, and intelligence in the Cloud.com Cloud Stack. This package +Description: CloudStack client + The CloudStack management server is the central point of coordination, + management, and intelligence in the CloudStack Cloud Stack. This package is required for the management server to work. Package: cloud-setup @@ -121,21 +121,21 @@ Conflicts: vmops-setup Replaces: vmops-setup Architecture: any Depends: openjdk-6-jre, python, cloud-utils (= ${source:Version}), cloud-deps (= ${source:Version}), cloud-server (= ${source:Version}), cloud-python (= ${source:Version}), python-mysqldb -Description: Cloud.com client - The Cloud.com setup tools let you set up your Management Server and Usage Server. +Description: CloudStack client + The CloudStack setup tools let you set up your Management Server and Usage Server. Package: cloud-python Architecture: any Depends: python -Description: Cloud.com Python library - The Cloud.com Python library contains a few Python modules that the +Description: CloudStack Python library + The CloudStack Python library contains a few Python modules that the CloudStack uses. Package: cloud-agent-libs Architecture: any Depends: openjdk-6-jre, cloud-utils (= ${source:Version}), cloud-core (= ${source:Version}), cloud-agent-deps (= ${source:Version}), libcommons-httpclient-java, libcommons-collections-java, libcommons-dbcp-java, libcommons-pool-java, libcommons-logging-java -Description: Cloud.com agent libraries - The Cloud.com agent libraries are used by the Cloud Agent and the Cloud +Description: CloudStack agent libraries + The CloudStack agent libraries are used by the Cloud Agent and the Cloud Console Proxy. Package: cloud-agent @@ -144,24 +144,24 @@ Conflicts: vmops-agent Replaces: vmops-agent Architecture: any Depends: openjdk-6-jre, cloud-utils (= ${source:Version}), cloud-core (= ${source:Version}), cloud-agent-deps (= ${source:Version}), python, cloud-python (= ${source:Version}), cloud-agent-libs (= ${source:Version}), cloud-agent-scripts (= ${source:Version}), libcommons-httpclient-java, libcommons-collections-java, libcommons-dbcp-java, libcommons-pool-java, libcommons-logging-java, libvirt0, cloud-daemonize, sysvinit-utils, chkconfig, qemu-kvm, libvirt-bin, uuid-runtime, rsync, grep, iproute, jnetpcap, ebtables, vlan, libcglib-java, libcommons-httpclient-java, libservlet2.5-java, liblog4j1.2-java, libjna-java, wget -Description: Cloud.com agent - The Cloud.com agent is in charge of managing shared computing resources in - a Cloud.com Cloud Stack-powered cloud. Install this package if this computer +Description: CloudStack agent + The CloudStack agent is in charge of managing shared computing resources in + a CloudStack Cloud Stack-powered cloud. Install this package if this computer will participate in your cloud. Package: cloud-system-iso Architecture: any -Description: Cloud.com system iso - The Cloud.com agent is in charge of managing shared computing resources in - a Cloud.com Cloud Stack-powered cloud. Install this package if this computer +Description: CloudStack system iso + The CloudStack agent is in charge of managing shared computing resources in + a CloudStack Cloud Stack-powered cloud. Install this package if this computer will participate in your cloud. Package: cloud-console-proxy Architecture: any Depends: openjdk-6-jre, cloud-utils (= ${source:Version}), cloud-core (= ${source:Version}), cloud-deps (= ${source:Version}), cloud-agent-libs (= ${source:Version}), python, cloud-python (= ${source:Version}), libcommons-httpclient-java, libcommons-collections-java, libcommons-dbcp-java, libcommons-pool-java, libcommons-logging-java, cloud-daemonize, sysvinit-utils, chkconfig, augeas-tools, uuid-runtime, grep, iproute -Description: Cloud.com console proxy - The Cloud.com console proxy is the service in charge of granting console - access into virtual machines managed by the Cloud.com CloudStack. +Description: CloudStack console proxy + The CloudStack console proxy is the service in charge of granting console + access into virtual machines managed by the CloudStack CloudStack. Package: cloud-usage Provides: vmops-usage @@ -169,6 +169,6 @@ Conflicts: vmops-usage Replaces: vmops-usage Architecture: any Depends: openjdk-6-jre, cloud-utils (= ${source:Version}), cloud-core (= ${source:Version}), cloud-deps (= ${source:Version}), cloud-server (= ${source:Version}), cloud-daemonize (= ${source:Version}), cloud-setup (= ${source:Version}), cloud-client (= ${source:Version}) -Description: Cloud.com usage monitor - The Cloud.com usage monitor provides usage accounting across the entire cloud for +Description: CloudStack usage monitor + The CloudStack usage monitor provides usage accounting across the entire cloud for cloud operators to charge based on usage parameters. diff --git a/docs/2.0/downloads.html b/docs/2.0/downloads.html index 7a4762290fb..b502ffb56af 100644 --- a/docs/2.0/downloads.html +++ b/docs/2.0/downloads.html @@ -72,7 +72,7 @@ a:hover.toplink {background:url(images/top_icon_hover.png) no-repeat top left;}
- Cloud.com | Community + CloudStack | Community
diff --git a/docs/2.2/downloads-supp3.html b/docs/2.2/downloads-supp3.html index 4c3c154ba41..199af2314d4 100644 --- a/docs/2.2/downloads-supp3.html +++ b/docs/2.2/downloads-supp3.html @@ -72,7 +72,7 @@ a:hover.toplink {background:url(images/top_icon_hover.png) no-repeat top left;}
- Cloud.com | Community + CloudStack | Community
diff --git a/python/lib/cloud_utils.py b/python/lib/cloud_utils.py index 798aacafb74..2cda1978f3b 100644 --- a/python/lib/cloud_utils.py +++ b/python/lib/cloud_utils.py @@ -21,7 +21,7 @@ # -*- coding: utf-8 -*- -"""Cloud.com Python utility library""" +"""CloudStack Python utility library""" import sys, os, subprocess, errno, re, time, glob import urllib2 @@ -1072,7 +1072,6 @@ def setup_consoleproxy_config(configfile, host, zone, pod): # =========================== DATABASE MIGRATION SUPPORT CODE =================== # Migrator, Migratee and Evolvers -- this is the generic infrastructure. -# To actually implement Cloud.com-specific code, search "Cloud.com-specific evolvers and context" class MigratorException(Exception): pass diff --git a/server/src/com/cloud/hypervisor/vmware/VmwareManagerImpl.java b/server/src/com/cloud/hypervisor/vmware/VmwareManagerImpl.java index 94a025d333c..941d3af7246 100755 --- a/server/src/com/cloud/hypervisor/vmware/VmwareManagerImpl.java +++ b/server/src/com/cloud/hypervisor/vmware/VmwareManagerImpl.java @@ -604,7 +604,7 @@ public class VmwareManagerImpl implements VmwareManager, VmwareStorageMount, Lis @Override public void run() { // TODO scan vSphere for newly added hosts. - // we are going to both support adding host from Cloud.com UI and + // we are going to both support adding host from CloudStack UI and // adding host via vSphere server // // will implement host scanning later diff --git a/server/src/com/cloud/upgrade/DatabaseIntegrityChecker.java b/server/src/com/cloud/upgrade/DatabaseIntegrityChecker.java index e38dec4d778..de41c11b68d 100755 --- a/server/src/com/cloud/upgrade/DatabaseIntegrityChecker.java +++ b/server/src/com/cloud/upgrade/DatabaseIntegrityChecker.java @@ -63,7 +63,7 @@ public class DatabaseIntegrityChecker implements SystemIntegrityChecker { boolean noDuplicate = true; StringBuffer helpInfo = new StringBuffer(); - String note = "DATABASE INTEGRITY ERROR\nManagement server detected there are some hosts connect to the same loacal storage, please contact Cloud.com support team for solution. Below are detialed info, please attach all of them to Cloud.com support. Thank you\n"; + String note = "DATABASE INTEGRITY ERROR\nManagement server detected there are some hosts connect to the same loacal storage, please contact CloudStack support team for solution. Below are detialed info, please attach all of them to CloudStack support. Thank you\n"; helpInfo.append(note); while (rs.next()) { long poolId = rs.getLong(1); @@ -216,7 +216,7 @@ public class DatabaseIntegrityChecker implements SystemIntegrityChecker { } if (!checkMissedPremiumUpgradeFor228()) { - s_logger.error("Your current database version is 2.2.8, management server detected some missed premium upgrade, please contact Cloud.com support and attach log file. Thank you!"); + s_logger.error("Your current database version is 2.2.8, management server detected some missed premium upgrade, please contact CloudStack support and attach log file. Thank you!"); throw new CloudRuntimeException("Detected missed premium upgrade"); } } finally { diff --git a/setup/apidoc/generatecommand.xsl b/setup/apidoc/generatecommand.xsl index e50d8c73e62..ad39788dc28 100644 --- a/setup/apidoc/generatecommand.xsl +++ b/setup/apidoc/generatecommand.xsl @@ -161,7 +161,7 @@ version="1.0">
  • Contacts
    • -

    Copyright 2010 Cloud.com, Inc. All rights reserved

    +

    Copyright 2010 CloudStack, Inc. All rights reserved