cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ahu...@apache.org
Subject [1/50] [abbrv] git commit: Brought over new changes from master
Date Thu, 13 Sep 2012 18:43:48 GMT
Updated Branches:
  refs/heads/javelin 06b7d80fe -> db9cc97ab


Brought over new changes from master


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/db9cc97a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/db9cc97a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/db9cc97a

Branch: refs/heads/javelin
Commit: db9cc97ab3210c436d953837b274d0ff4bfe63d5
Parents: 06b7d80 cfc2b85
Author: Alex Huang <alex.huang@citrix.com>
Authored: Thu Sep 13 11:43:22 2012 -0700
Committer: Alex Huang <alex.huang@citrix.com>
Committed: Thu Sep 13 11:43:22 2012 -0700

----------------------------------------------------------------------
 .gitignore                                         |    4 +-
 .../cloud/agent/manager/SimulatorManagerImpl.java  |    6 +-
 agent/conf/environment.properties.in               |    2 +-
 api/src/com/cloud/agent/api/to/IpAddressTO.java    |    8 +-
 api/src/com/cloud/api/commands/ListVMsCmd.java     |    7 +
 awsapi/modules/.gitignore                          |   54 -
 awsapi/pom.xml                                     |   12 +
 build/build-aws-api.xml                            |   22 +-
 build/build-cloud-plugins.xml                      |    1 -
 build/build-cloud.xml                              |   18 +-
 build/deploy/branding/default/images/favicon.ico   |  Bin 1406 -> 0 bytes
 .../deploy/branding/default/images/header_logo.gif |  Bin 5319 -> 0 bytes
 .../deploy/branding/godaddy/images/header_logo.gif |  Bin 3047 -> 0 bytes
 .../deploy/branding/nframe/images/header_logo.gif  |  Bin 2774 -> 0 bytes
 .../deploy/branding/superb/images/header_logo.gif  |  Bin 2837 -> 0 bytes
 build/deploy/db/deploy-db.sh                       |  126 --
 build/deploy/db/log4j.properties                   |   24 -
 build/deploy/deploy-agent.sh                       |  232 ---
 build/deploy/deploy-console-proxy.sh               |   90 --
 build/deploy/deploy-server.sh                      |  121 --
 build/deploy/deploy-simulator.sh                   |  200 ---
 build/deploy/install-storage-server.sh             |  149 --
 build/deploy/install.sh                            |  155 --
 .../consoleproxy/conf/consoleproxy.properties      |   23 -
 build/deploy/production/db/server-setup-dev.xml    |  550 --------
 build/deploy/production/db/templates-dev.sql       |   30 -
 .../production/premium/conf/log4j-cloud_usage.xml  |   85 --
 .../premium/conf/log4j-cloud_usage.xml.template    |   85 --
 .../production/premium/conf/usage-components.xml   |   67 -
 .../production/server/conf/agent-update.properties |   18 -
 .../production/server/conf/cloud-localhost.pk12    |  Bin 1597 -> 0 bytes
 build/deploy/production/server/conf/ehcache.xml    |  544 -------
 .../deploy/production/server/conf/log4j-cloud.xml  |  131 --
 .../server/conf/log4j-cloud.xml.template           |  107 --
 build/deploy/production/server/conf/server.xml     |  149 --
 build/developer.xml                                |    3 +
 build/package.xml                                  |   23 -
 client/tomcatconf/environment.properties.in        |    2 +-
 cloud.spec                                         |   37 +-
 .../virtualnetwork/VirtualRoutingResource.java     |    4 +-
 core/src/com/cloud/user/UserAccountVO.java         |   13 +-
 debian/cloud-agent-deps.install                    |    2 +-
 debian/cloud-agent-scripts.config                  |   17 -
 debian/cloud-agent-scripts.install                 |   27 -
 debian/cloud-agent-scripts.postinst                |   29 -
 debian/cloud-deps.install                          |    2 +-
 debian/cloud-scripts.install                       |   27 +
 debian/cloud-system-iso.install                    |    2 +-
 debian/control                                     |   46 +-
 docs/en-US/citrix-xenserver-installation.xml       |  489 +++++++
 docs/en-US/provisioning-steps.xml                  |    3 +-
 plugins/hypervisors/kvm/pom.xml                    |    2 +-
 .../kvm/resource/LibvirtComputingResource.java     |   49 +-
 .../kvm/storage/KVMStoragePoolManager.java         |    4 +
 .../kvm/storage/LibvirtStorageAdaptor.java         |   17 +
 .../hypervisor/kvm/storage/StorageAdaptor.java     |    2 +
 .../hypervisor/vmware/resource/VmwareResource.java |    4 +-
 .../xen/resource/CitrixResourceBase.java           |    4 +-
 .../element/F5ExternalLoadBalancerElement.java     |    2 +-
 .../element/JuniperSRXExternalFirewallElement.java |    4 +-
 .../cloud/network/element/NetscalerElement.java    |    2 +-
 .../cloud/network/ovs/OvsDestroyBridgeCommand.java |   18 +-
 .../cloud/network/ovs/OvsFetchInterfaceAnswer.java |   18 +-
 .../network/ovs/OvsFetchInterfaceCommand.java      |   17 -
 .../cloud/network/ovs/OvsSetupBridgeCommand.java   |   17 -
 scripts/storage/secondary/cloud-install-sys-tmplt  |    2 +-
 .../src/com/cloud/async/AsyncJobManagerImpl.java   |   17 -
 server/src/com/cloud/configuration/Config.java     |    2 +-
 .../configuration/ConfigurationManagerImpl.java    |    1 +
 .../network/ExternalFirewallDeviceManagerImpl.java |    2 +-
 .../ExternalLoadBalancerDeviceManagerImpl.java     |    2 +-
 .../router/VirtualNetworkApplianceManagerImpl.java |    4 +-
 .../VpcVirtualNetworkApplianceManagerImpl.java     |    4 +-
 .../security/dao/SecurityGroupWorkDaoImpl.java     |    2 +
 server/src/com/cloud/server/Criteria.java          |    1 +
 server/src/com/cloud/user/AccountManagerImpl.java  |   62 +-
 server/src/com/cloud/vm/UserVmManagerImpl.java     |   23 +
 .../com/cloud/vm/VirtualMachineManagerImpl.java    |   40 +-
 setup/db/create-schema.sql                         |    1 +
 setup/db/db/schema-302to40.sql                     |    3 +
 test/integration/README                            |   10 +-
 test/integration/component/test_accounts.py        |  964 ++++++++++++-
 .../component/test_allocation_states.py            |  274 ++++
 test/integration/component/test_blocker_bugs.py    |  160 ++-
 test/integration/component/test_egress_rules.py    |   65 +-
 test/integration/component/test_eip_elb.py         |  347 +++---
 .../component/test_high_availability.py            | 1093 ---------------
 .../integration/component/test_network_offering.py |  198 +++-
 test/integration/component/test_project_configs.py |  613 +++++---
 test/integration/component/test_project_limits.py  |  243 +++-
 .../component/test_project_resources.py            |  158 ++-
 test/integration/component/test_project_usage.py   |  181 ++--
 test/integration/component/test_projects.py        |  599 ++++-----
 test/integration/component/test_resource_limits.py |  343 +++---
 test/integration/component/test_routers.py         |   47 +-
 test/integration/component/test_security_groups.py |  434 +++---
 test/integration/component/test_snapshots.py       |  191 ++-
 test/integration/component/test_templates.py       |   60 +-
 test/integration/component/test_usage.py           |  159 ++-
 test/integration/component/test_volumes.py         |  199 +++-
 test/integration/lib/base.py                       |  116 ++-
 test/integration/lib/common.py                     |    4 +-
 test/integration/lib/utils.py                      |   14 +-
 test/integration/smoke/test_disk_offerings.py      |    4 +
 test/integration/smoke/test_hosts.py               |    2 +
 test/integration/smoke/test_iso.py                 |   15 +-
 test/integration/smoke/test_network.py             |   49 +-
 test/integration/smoke/test_primary_storage.py     |    2 +
 test/integration/smoke/test_routers.py             |   24 +-
 test/integration/smoke/test_secondary_storage.py   |   16 +-
 test/integration/smoke/test_service_offerings.py   |    6 +-
 test/integration/smoke/test_snapshots.py           |   23 +-
 test/integration/smoke/test_ssvm.py                |   15 +-
 test/integration/smoke/test_templates.py           |   17 +-
 test/integration/smoke/test_vm_life_cycle.py       |   66 +-
 test/integration/smoke/test_volumes.py             |   14 +-
 test/setup-test-data.sh                            |   94 ++
 tools/marvin/marvin/configGenerator.py             |    9 +
 tools/marvin/marvin/deployDataCenter.py            |   16 +-
 tools/marvin/marvin/sandbox/README.txt             |    4 +-
 ui/scripts/network.js                              |   49 +-
 ui/scripts/system.js                               |   12 +-
 .../centos/SYSCONFDIR/rc.d/init.d/cloud-usage.in   |  161 ++-
 .../fedora/SYSCONFDIR/rc.d/init.d/cloud-usage.in   |  161 ++-
 .../opensuse/SYSCONFDIR/init.d/cloud-usage.in      |  169 ++-
 .../rhel/SYSCONFDIR/rc.d/init.d/cloud-usage.in     |  161 ++-
 usage/distro/sles/SYSCONFDIR/init.d/cloud-usage.in |  169 ++-
 .../distro/ubuntu/SYSCONFDIR/init.d/cloud-usage.in |  149 +-
 usage/src/com/cloud/usage/UsageManagerImpl.java    |  476 ++++----
 usage/src/com/cloud/usage/UsageSanityChecker.java  |   14 +-
 .../cloud/usage/parser/IPAddressUsageParser.java   |    2 +-
 .../usage/parser/LoadBalancerUsageParser.java      |   80 +-
 .../usage/parser/NetworkOfferingUsageParser.java   |   94 +-
 .../com/cloud/usage/parser/NetworkUsageParser.java |   28 +-
 .../usage/parser/PortForwardingUsageParser.java    |   72 +-
 .../usage/parser/SecurityGroupUsageParser.java     |   82 +-
 .../com/cloud/usage/parser/StorageUsageParser.java |  144 +-
 usage/src/com/cloud/usage/parser/UsageParser.java  |   22 +-
 .../cloud/usage/parser/VMInstanceUsageParser.java  |   96 +-
 .../com/cloud/usage/parser/VPNUserUsageParser.java |   88 +-
 .../com/cloud/usage/parser/VolumeUsageParser.java  |   88 +-
 utils/src/com/cloud/utils/db/SearchCriteria.java   |   31 +-
 wscript_build                                      |   12 +-
 wscript_configure                                  |   31 +-
 144 files changed, 5957 insertions(+), 7354 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/db9cc97a/awsapi/modules/.gitignore
----------------------------------------------------------------------
diff --cc awsapi/modules/.gitignore
index 68b3d43,68b3d43..0000000
deleted file mode 100644,100644
--- a/awsapi/modules/.gitignore
+++ /dev/null
@@@ -1,54 -1,54 +1,0 @@@
--# 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.
--
--build/replace.properties
--build/build.number
--bin/
--cloudstack-proprietary/
--premium/
--.lock-wscript
--artifacts/
--.waf-*
--waf-*
--target/
--override/
--.metadata
--dist/
--*~
--*.bak
--cloud-*.tar.bz2
--*.log
--*.pyc
--build.number
--api.log.*.gz
--cloud.log.*.*
--unittest
--deps/cloud.userlibraries
--deps/awsapi-lib/
--.DS_Store
--.idea
--*.iml
--git-remote-https.exe.stackdump
--*.swp
--tools/devcloud/devcloudbox/.vagrant
--deps/*.jar
--deps/*.war
--deps/*.mar
--*.jar
--awsapi/modules/*
--!.gitignore
--

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/db9cc97a/awsapi/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/db9cc97a/docs/en-US/provisioning-steps.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/db9cc97a/setup/db/create-schema.sql
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/db9cc97a/utils/src/com/cloud/utils/db/SearchCriteria.java
----------------------------------------------------------------------
diff --cc utils/src/com/cloud/utils/db/SearchCriteria.java
index aa1a223,ba4e84d..85f7708
--- a/utils/src/com/cloud/utils/db/SearchCriteria.java
+++ b/utils/src/com/cloud/utils/db/SearchCriteria.java
@@@ -199,27 -216,28 +199,28 @@@ public class SearchCriteria<K> 
      public boolean isSelectAll() {
          return _selects == null || _selects.size() == 0;
      }
 -    
 +
      protected JoinBuilder<SearchCriteria<?>> findJoin(Map<String, JoinBuilder<SearchCriteria<?>>>
jbmap, String joinName) {
-         JoinBuilder<SearchCriteria<?>> jb = jbmap.get(joinName);
-         if (jb != null) {
-             return jb;
-         }
- 
-         for (JoinBuilder<SearchCriteria<?>> j2 : _joins.values()) {
-             SearchCriteria<?> sc = j2.getT();
-             jb = findJoin(sc._joins, joinName);
-             if (jb != null) {
-                 return jb;
-             }
-         }
- 
-         assert (false) : "Unable to find a join by the name " + joinName;
-         return null;
+     	JoinBuilder<SearchCriteria<?>> jb = jbmap.get(joinName);
+     	if (jb != null) {
+     		return jb;
+     	}
+     	
+     	for (JoinBuilder<SearchCriteria<?>> j2 : jbmap.values()) {
+     		SearchCriteria<?> sc = j2.getT();
+     		if(sc._joins != null)
+     		    jb = findJoin(sc._joins, joinName);
+     		if (jb != null) {
+     			return jb;
+     		}
+     	}
+     	
+     	assert (false) : "Unable to find a join by the name " + joinName;
+     	return null;
      }
 -    
 +
      public void setJoinParameters(String joinName, String conditionName, Object... params)
{
 -    	JoinBuilder<SearchCriteria<?>> join = findJoin(_joins, joinName);
 +        JoinBuilder<SearchCriteria<?>> join = findJoin(_joins, joinName);
          assert (join != null) : "Incorrect join name specified: " + joinName;
          join.getT().setParameters(conditionName, params);
  


Mime
View raw message