Merge lp://qastaging/~kirkland/eucalyptus/label-metadata into lp://qastaging/eucalyptus/1.6.2

Proposed by Dustin Kirkland 
Status: Superseded
Proposed branch: lp://qastaging/~kirkland/eucalyptus/label-metadata
Merge into: lp://qastaging/eucalyptus/1.6.2
Diff against target: 97407 lines (+47387/-30493) (has conflicts)
813 files modified
Makefile (+1/-1)
VERSION (+1/-1)
clc/.classpath (+24/-10)
clc/.project (+1/-1)
clc/Makefile (+12/-16)
clc/build.xml (+223/-189)
clc/modules/authentication/conf/upgrade/upgrade_auth.groovy (+173/-0)
clc/modules/authentication/src/main/java/com/eucalyptus/auth/AllGroup.java (+44/-0)
clc/modules/authentication/src/main/java/com/eucalyptus/auth/CredentialEntities.groovy (+140/-34)
clc/modules/authentication/src/main/java/com/eucalyptus/auth/CredentialProvider.java (+0/-347)
clc/modules/authentication/src/main/java/com/eucalyptus/auth/Credentials.java (+0/-107)
clc/modules/authentication/src/main/java/com/eucalyptus/auth/DatabaseAuthBootstrapper.java (+72/-0)
clc/modules/authentication/src/main/java/com/eucalyptus/auth/DatabaseAuthProvider.java (+423/-0)
clc/modules/authentication/src/main/java/com/eucalyptus/auth/DatabaseWrappedGroup.java (+218/-0)
clc/modules/authentication/src/main/java/com/eucalyptus/auth/DatabaseWrappedUser.java (+299/-0)
clc/modules/authentication/src/main/java/com/eucalyptus/auth/Debugging.java (+45/-0)
clc/modules/authentication/src/main/java/com/eucalyptus/auth/GroupEntity.java (+254/-0)
clc/modules/authentication/src/main/java/com/eucalyptus/auth/RemoteComponentCredentialBootstrapper.java (+0/-120)
clc/modules/authentication/src/main/java/com/eucalyptus/auth/SystemCredentialProvider.java (+25/-15)
clc/modules/authentication/src/main/java/com/eucalyptus/auth/UserExistsException.java (+0/-84)
clc/modules/authentication/src/main/java/com/eucalyptus/auth/WrappedUser.java (+8/-0)
clc/modules/authentication/src/main/java/com/eucalyptus/auth/crypto/DefaultCryptoProvider.java (+215/-0)
clc/modules/authentication/src/main/java/com/eucalyptus/auth/util/AuthBootstrapHelper.java (+49/-0)
clc/modules/authentication/src/main/java/com/eucalyptus/auth/util/EucaKeyStore.java (+1/-6)
clc/modules/authentication/src/main/java/com/eucalyptus/auth/util/Hashes.java (+37/-121)
clc/modules/authentication/src/main/java/com/eucalyptus/auth/util/KeyTool.java (+0/-156)
clc/modules/authentication/src/main/java/com/eucalyptus/auth/util/SslSetup.java (+2/-2)
clc/modules/bootstrap/Makefile (+1/-1)
clc/modules/bootstrap/arguments.ggo (+3/-1)
clc/modules/bootstrap/eucalyptus-bootstrap.c (+28/-20)
clc/modules/bootstrap/eucalyptus-bootstrap.h (+5/-2)
clc/modules/bootstrap/eucalyptus-opts.c (+77/-30)
clc/modules/bootstrap/eucalyptus-opts.h (+8/-1)
clc/modules/cloud/src/main/resources/com.eucalyptus.CloudServiceProvider (+3/-0)
clc/modules/cloud/src/main/resources/eucalyptus-interface.xml (+8/-4)
clc/modules/cloud/src/main/resources/eucalyptus-runtime.xml (+9/-9)
clc/modules/cloud/src/main/resources/eucalyptus-services.xml (+1/-1)
clc/modules/cloud/src/main/resources/eucalyptus-storage.xml (+3/-3)
clc/modules/cloud/src/main/resources/eucalyptus-verification.xml (+2/-2)
clc/modules/cluster-manager/cluster-manager.iml (+0/-27)
clc/modules/cluster-manager/conf/scripts/LeastFullFirst.groovy (+0/-34)
clc/modules/cluster-manager/pom.xml (+0/-101)
clc/modules/cluster-manager/src/main/java/com/eucalyptus/address/AbstractSystemAddressManager.java (+148/-15)
clc/modules/cluster-manager/src/main/java/com/eucalyptus/address/Address.java (+262/-105)
clc/modules/cluster-manager/src/main/java/com/eucalyptus/address/AddressCategory.java (+28/-8)
clc/modules/cluster-manager/src/main/java/com/eucalyptus/address/AddressManager.java (+236/-0)
clc/modules/cluster-manager/src/main/java/com/eucalyptus/address/Addresses.java (+25/-77)
clc/modules/cluster-manager/src/main/java/com/eucalyptus/address/ClusterAddressInfo.groovy (+52/-0)
clc/modules/cluster-manager/src/main/java/com/eucalyptus/address/DynamicSystemAddressManager.java (+14/-16)
clc/modules/cluster-manager/src/main/java/com/eucalyptus/address/NullSystemAddressManager.java (+1/-8)
clc/modules/cluster-manager/src/main/java/com/eucalyptus/address/StaticSystemAddressManager.java (+1/-8)
clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/Callback.java (+0/-1)
clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/Cluster.java (+43/-109)
clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/ClusterBootstrapper.java (+0/-224)
clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/ClusterBuilder.java (+261/-0)
clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/ClusterEndpoint.java (+319/-0)
clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/ClusterMessageQueue.java (+138/-30)
clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/ClusterNodeState.java (+42/-16)
clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/ClusterState.java (+28/-13)
clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/ClusterThreadFactory.java (+39/-0)
clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/Clusters.java (+141/-49)
clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/FailureCallback.java (+4/-3)
clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/NetworkAlreadyExistsException.java (+68/-0)
clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/NoSuchTokenException.java (+82/-0)
clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/StatefulMessageSet.java (+111/-0)
clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/SuccessCallback.java (+6/-3)
clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/UnconditionalCallback.java (+4/-3)
clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/VmInstance.java (+578/-0)
clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/VmInstances.java (+242/-0)
clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/VmTypeAvailability.java (+166/-0)
clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/VmTypeVerify.java (+91/-0)
clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/VmTypes.java (+152/-0)
clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/callback/AssignAddressCallback.java (+163/-0)
clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/callback/BroadcastCallback.java (+19/-0)
clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/callback/ConfigureNetworkCallback.java (+107/-0)
clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/callback/ConsoleOutputCallback.java (+110/-0)
clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/callback/QueuedEventCallback.java (+401/-0)
clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/callback/RebootCallback.java (+94/-0)
clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/callback/ResourceStateCallback.java (+31/-0)
clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/callback/StartNetworkCallback.java (+118/-0)
clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/callback/StateUpdateHandler.java (+68/-0)
clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/callback/StopNetworkCallback.java (+118/-0)
clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/callback/TerminateCallback.java (+99/-0)
clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/callback/UnassignAddressCallback.java (+165/-0)
clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/callback/VmRunCallback.java (+210/-0)
clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/callback/VolumeAttachCallback.java (+124/-0)
clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/callback/VolumeDetachCallback.java (+102/-0)
clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/handlers/AbstractClusterMessageDispatcher.java (+18/-28)
clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/handlers/AddressStateHandler.java (+11/-10)
clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/handlers/ClusterCertificateHandler.java (+18/-17)
clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/handlers/LogStateHandler.java (+1/-1)
clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/handlers/NetworkStateHandler.java (+2/-2)
clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/handlers/ResourceStateHandler.java (+19/-23)
clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/handlers/VmStateHandler.java (+48/-41)
clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/util/ClusterUtil.java (+0/-86)
clc/modules/cluster-manager/src/main/java/com/eucalyptus/sla/ClusterAllocator.java (+153/-140)
clc/modules/cluster-manager/src/main/java/com/eucalyptus/sla/CreateVmInstances.java (+112/-0)
clc/modules/cluster-manager/src/main/java/com/eucalyptus/sla/NodeResourceAllocator.java (+38/-31)
clc/modules/cluster-manager/src/main/java/com/eucalyptus/sla/PrivateNetworkAllocator.groovy (+1/-3)
clc/modules/cluster-manager/src/main/java/com/eucalyptus/sla/VmAdmissionControl.java (+7/-7)
clc/modules/cluster-manager/src/main/java/com/eucalyptus/vm/SystemState.java (+446/-0)
clc/modules/cluster-manager/src/main/java/com/eucalyptus/vm/VmControl.java (+224/-0)
clc/modules/cluster-manager/src/main/java/com/eucalyptus/vm/VmMetadata.java (+97/-0)
clc/modules/cluster-manager/src/main/java/com/eucalyptus/vm/VmReplyTransform.java (+97/-0)
clc/modules/cluster-manager/src/main/java/com/eucalyptus/vm/VmState.java (+109/-0)
clc/modules/cluster-manager/src/main/java/edu/ucsb/eucalyptus/cloud/cluster/ClusterEndpoint.java (+0/-294)
clc/modules/cluster-manager/src/main/java/edu/ucsb/eucalyptus/cloud/cluster/ClusterEnvelope.java (+0/-105)
clc/modules/cluster-manager/src/main/java/edu/ucsb/eucalyptus/cloud/cluster/ConfigureNetworkCallback.java (+0/-102)
clc/modules/cluster-manager/src/main/java/edu/ucsb/eucalyptus/cloud/cluster/EucalyptusWSException.java (+0/-90)
clc/modules/cluster-manager/src/main/java/edu/ucsb/eucalyptus/cloud/cluster/MultiClusterCallback.java (+0/-36)
clc/modules/cluster-manager/src/main/java/edu/ucsb/eucalyptus/cloud/cluster/NetworkAlreadyExistsException.java (+0/-68)
clc/modules/cluster-manager/src/main/java/edu/ucsb/eucalyptus/cloud/cluster/NoSuchTokenException.java (+0/-68)
clc/modules/cluster-manager/src/main/java/edu/ucsb/eucalyptus/cloud/cluster/QueuedEvent.java (+0/-128)
clc/modules/cluster-manager/src/main/java/edu/ucsb/eucalyptus/cloud/cluster/QueuedLogEvent.java (+0/-74)
clc/modules/cluster-manager/src/main/java/edu/ucsb/eucalyptus/cloud/cluster/RebootCallback.java (+0/-93)
clc/modules/cluster-manager/src/main/java/edu/ucsb/eucalyptus/cloud/cluster/Reservation.java (+0/-181)
clc/modules/cluster-manager/src/main/java/edu/ucsb/eucalyptus/cloud/cluster/Reservations.java (+0/-106)
clc/modules/cluster-manager/src/main/java/edu/ucsb/eucalyptus/cloud/cluster/StartNetworkCallback.java (+0/-127)
clc/modules/cluster-manager/src/main/java/edu/ucsb/eucalyptus/cloud/cluster/StopNetworkCallback.java (+0/-124)
clc/modules/cluster-manager/src/main/java/edu/ucsb/eucalyptus/cloud/cluster/TerminateCallback.java (+0/-99)
clc/modules/cluster-manager/src/main/java/edu/ucsb/eucalyptus/cloud/cluster/VmRunCallback.java (+0/-170)
clc/modules/cluster-manager/src/main/java/edu/ucsb/eucalyptus/cloud/cluster/VmTypeAvailability.java (+0/-166)
clc/modules/cluster-manager/src/main/java/edu/ucsb/eucalyptus/cloud/cluster/VmTypeVerify.java (+0/-91)
clc/modules/cluster-manager/src/main/java/edu/ucsb/eucalyptus/cloud/cluster/VmTypes.java (+0/-152)
clc/modules/cluster-manager/src/main/java/edu/ucsb/eucalyptus/cloud/cluster/VolumeAttachCallback.java (+0/-117)
clc/modules/cluster-manager/src/main/java/edu/ucsb/eucalyptus/cloud/cluster/VolumeDetachCallback.java (+0/-103)
clc/modules/cluster-manager/src/main/java/edu/ucsb/eucalyptus/cloud/ws/AddressManager.java (+0/-252)
clc/modules/cluster-manager/src/main/java/edu/ucsb/eucalyptus/cloud/ws/CreateVmInstances.java (+0/-118)
clc/modules/cluster-manager/src/main/java/edu/ucsb/eucalyptus/cloud/ws/VmControl.java (+0/-131)
clc/modules/cluster-manager/src/main/java/edu/ucsb/eucalyptus/cloud/ws/VmReplyTransform.java (+0/-97)
clc/modules/cluster-manager/src/main/resources/cluster-model.xml (+79/-0)
clc/modules/cluster-manager/src/main/resources/cluster-services.xml (+78/-0)
clc/modules/cluster-manager/src/main/resources/com.eucalyptus.CloudServiceProvider (+6/-0)
clc/modules/component/build.xml (+42/-0)
clc/modules/component/src/main/java/com/eucalyptus/cloud/ws/ComponentService.java (+72/-0)
clc/modules/component/src/main/resources/com.eucalyptus.CloudServiceProvider (+6/-0)
clc/modules/component/src/main/resources/component-model.xml (+113/-0)
clc/modules/component/src/main/resources/component-services.xml (+82/-0)
clc/modules/configuration/src/main/java/com/eucalyptus/accounts/Accounts.java (+142/-0)
clc/modules/configuration/src/main/java/com/eucalyptus/config/Configuration.java (+58/-161)
clc/modules/configuration/src/main/java/com/eucalyptus/config/ConfigurationEntities.groovy (+0/-295)
clc/modules/configuration/src/main/java/com/eucalyptus/config/ConfigurationUtil.java (+5/-146)
clc/modules/configuration/src/main/java/com/eucalyptus/config/Handles.java (+12/-0)
clc/modules/configuration/src/main/java/com/eucalyptus/config/Properties.java (+58/-0)
clc/modules/configuration/src/main/java/com/eucalyptus/config/RegistrationHandlerDiscovery.java (+26/-0)
clc/modules/configuration/src/main/java/com/eucalyptus/config/StorageControllerBuilder.java (+79/-0)
clc/modules/configuration/src/main/java/com/eucalyptus/config/WalrusBuilder.java (+31/-0)
clc/modules/configuration/src/main/java/com/eucalyptus/event/ComponentEvent.java (+0/-38)
clc/modules/configuration/src/main/java/com/eucalyptus/event/StartComponentEvent.java (+0/-41)
clc/modules/configuration/src/main/java/com/eucalyptus/event/StopComponentEvent.java (+0/-31)
clc/modules/configuration/src/main/resources/com.eucalyptus.CloudServiceProvider (+3/-0)
clc/modules/configuration/src/main/resources/eucalyptus-configuration.xml (+78/-78)
clc/modules/core/conf/scripts/Import_150.groovy (+0/-561)
clc/modules/core/conf/scripts/Import_152.groovy (+0/-584)
clc/modules/core/conf/scripts/storageprops.groovy (+8/-0)
clc/modules/core/conf/scripts/walrusprops.groovy (+17/-0)
clc/modules/core/conf/upgrade/Upgrade1_6_2to2_0.java (+290/-0)
clc/modules/core/conf/upgrade/upgrade_misc_1_6_2to2_0_0.groovy (+92/-0)
clc/modules/core/conf/upgrade/upgrade_walrus_1_6_2to2_0_0.groovy (+119/-0)
clc/modules/core/pom.xml (+0/-143)
clc/modules/core/src/main/java/com/eucalyptus/bootstrap/RemoteDatabaseBootstrapper.java (+7/-7)
clc/modules/core/src/main/java/com/eucalyptus/upgrade/AbstractUpgradeScript.java (+28/-0)
clc/modules/core/src/main/java/com/eucalyptus/upgrade/DatabaseDestination.java (+5/-0)
clc/modules/core/src/main/java/com/eucalyptus/upgrade/DatabaseSource.java (+10/-0)
clc/modules/core/src/main/java/com/eucalyptus/upgrade/HsqldbDestination.java (+20/-0)
clc/modules/core/src/main/java/com/eucalyptus/upgrade/HsqldbSource.java (+51/-0)
clc/modules/core/src/main/java/com/eucalyptus/upgrade/StandalonePersistence.java (+276/-0)
clc/modules/core/src/main/java/com/eucalyptus/upgrade/UpgradeScript.java (+30/-0)
clc/modules/core/src/main/java/com/eucalyptus/upgrade/UpgradeScriptDiscovery.java (+23/-0)
clc/modules/core/src/main/java/com/eucalyptus/util/BlockStorageUtil.java (+129/-0)
clc/modules/core/src/main/java/com/eucalyptus/util/DNSProperties.java (+1/-2)
clc/modules/core/src/main/java/com/eucalyptus/util/StorageProperties.java (+33/-14)
clc/modules/core/src/main/java/com/eucalyptus/util/WalrusProperties.java (+28/-18)
clc/modules/core/src/main/java/com/eucalyptus/util/WalrusUtil.java (+8/-1)
clc/modules/core/src/main/java/edu/ucsb/eucalyptus/StartupChecks.java (+0/-250)
clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/InvalidBucketNameException.java (+91/-0)
clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/AOEMetaInfo.java (+105/-87)
clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/AOEVolumeInfo.java (+4/-2)
clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/AttachedVolumeInfo.java (+0/-132)
clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/BucketInfo.java (+23/-0)
clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/CHAPUserInfo.java (+136/-0)
clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/CertificateInfo.java (+0/-125)
clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/ClusterInfo.java (+6/-3)
clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/Counters.java (+0/-169)
clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/DirectStorageInfo.java (+219/-0)
clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/GrantInfo.java (+6/-5)
clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/ISCSIMetaInfo.java (+124/-105)
clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/ISCSIVolumeInfo.java (+1/-0)
clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/ImagePermissionInfo.java (+0/-117)
clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/LVMMetaInfo.java (+2/-41)
clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/LVMVolumeInfo.java (+1/-1)
clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/MetaDataInfo.java (+0/-2)
clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/ObjectInfo.java (+52/-3)
clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/StorageInfo.java (+101/-103)
clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/SystemConfiguration.java (+222/-62)
clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/UserGroupInfo.java (+0/-158)
clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/UserInfo.java (+0/-334)
clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/VmType.java (+0/-214)
clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/WalrusInfo.java (+90/-61)
clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/state/AbstractIsomorph.java (+5/-0)
clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/state/State.java (+1/-1)
clc/modules/core/src/main/java/edu/ucsb/eucalyptus/util/Admin.java (+0/-125)
clc/modules/core/src/main/java/edu/ucsb/eucalyptus/util/ReplyCoordinator.java (+65/-48)
clc/modules/core/src/main/java/edu/ucsb/eucalyptus/util/StreamConsumer.java (+1/-0)
clc/modules/core/src/main/java/edu/ucsb/eucalyptus/util/SystemUtil.java (+26/-4)
clc/modules/core/src/main/java/edu/ucsb/eucalyptus/util/UserManagement.java (+6/-70)
clc/modules/core/src/main/java/edu/ucsb/eucalyptus/util/WalrusDataMessenger.java (+0/-1)
clc/modules/core/src/main/java/edu/ucsb/eucalyptus/util/WalrusDataQueue.java (+0/-88)
clc/modules/core/src/main/java/edu/ucsb/eucalyptus/util/XMLParser.java (+1/-1)
clc/modules/core/src/main/java/org/hsqldb/HsqlSocketFactorySecure.java (+0/-94)
clc/modules/core/src/main/resources/log4j.xml (+195/-203)
clc/modules/database/conf/scripts/after_database.groovy (+10/-8)
clc/modules/database/conf/scripts/after_persistence.groovy (+1/-3)
clc/modules/database/conf/scripts/before_database.groovy (+32/-7)
clc/modules/database/conf/scripts/caches.groovy (+0/-1)
clc/modules/database/conf/scripts/pools.groovy (+4/-4)
clc/modules/database/src/main/java/com/eucalyptus/bootstrap/DatabaseConfig.java (+12/-14)
clc/modules/database/src/main/java/com/eucalyptus/bootstrap/LocalDatabaseBootstrapper.java (+14/-23)
clc/modules/database/src/main/java/com/eucalyptus/util/DatabaseUtil.java (+0/-109)
clc/modules/database/src/main/java/com/eucalyptus/util/EntityWrapper.java (+0/-233)
clc/modules/database/src/main/java/com/eucalyptus/util/TxHandle.java (+0/-198)
clc/modules/distribution/bin-assembly.xml (+0/-164)
clc/modules/distribution/distribution.iml (+0/-49)
clc/modules/distribution/lib-assembly.xml (+0/-84)
clc/modules/distribution/modules-assembly.xml (+0/-81)
clc/modules/distribution/pom.xml (+0/-299)
clc/modules/dns/src/main/java/com/eucalyptus/bootstrap/DNSBootstrapper.java (+5/-3)
clc/modules/dns/src/main/java/com/eucalyptus/cloud/ws/DNSControl.java (+19/-9)
clc/modules/dns/src/main/java/com/eucalyptus/cloud/ws/ZoneManager.java (+7/-1)
clc/modules/dns/src/main/java/com/eucalyptus/dns/TransientZone.java (+76/-5)
clc/modules/dns/src/main/java/com/eucalyptus/ic/DNS.java (+0/-101)
clc/modules/dns/src/main/resources/com.eucalyptus.CloudServiceProvider (+3/-0)
clc/modules/dns/src/main/resources/dns-model.xml (+0/-7)
clc/modules/dns/src/main/resources/dns-services.xml (+2/-2)
clc/modules/group-manager/pom.xml (+0/-87)
clc/modules/group-manager/src/main/java/com/eucalyptus/network/NetworkGroupManager.java (+54/-50)
clc/modules/group-manager/src/main/java/com/eucalyptus/network/NetworkGroupUtil.java (+6/-6)
clc/modules/hsqldb/build.xml (+71/-0)
clc/modules/hsqldb/src/main/java/org/hsqldb/HsqlSocketFactorySecure.java (+321/-0)
clc/modules/hsqldb/src/main/resources/com.eucalyptus.CloudServiceProvider (+6/-0)
clc/modules/hsqldb/src/main/resources/db-model.xml (+79/-0)
clc/modules/hsqldb/src/main/resources/db-services.xml (+78/-0)
clc/modules/image-manager/image-manager.iml (+0/-35)
clc/modules/image-manager/pom.xml (+0/-92)
clc/modules/image-manager/src/main/java/com/eucalyptus/blockstorage/Snapshot.java (+160/-0)
clc/modules/image-manager/src/main/java/com/eucalyptus/blockstorage/SnapshotManager.java (+251/-0)
clc/modules/image-manager/src/main/java/com/eucalyptus/blockstorage/StorageUtil.java (+172/-0)
clc/modules/image-manager/src/main/java/com/eucalyptus/blockstorage/Volume.java (+202/-0)
clc/modules/image-manager/src/main/java/com/eucalyptus/blockstorage/VolumeManager.java (+390/-0)
clc/modules/image-manager/src/main/java/com/eucalyptus/blockstorage/WalrusUtil.java (+210/-0)
clc/modules/image-manager/src/main/java/com/eucalyptus/images/ImageManager.java (+523/-0)
clc/modules/image-manager/src/main/java/com/eucalyptus/images/ImageUtil.java (+508/-0)
clc/modules/image-manager/src/main/java/com/eucalyptus/images/util/ImageUtil.java (+0/-481)
clc/modules/image-manager/src/main/java/com/eucalyptus/images/util/WalrusUtil.java (+0/-204)
clc/modules/image-manager/src/main/java/edu/ucsb/eucalyptus/cloud/state/Snapshot.java (+0/-155)
clc/modules/image-manager/src/main/java/edu/ucsb/eucalyptus/cloud/state/Volume.java (+0/-188)
clc/modules/image-manager/src/main/java/edu/ucsb/eucalyptus/cloud/ws/SnapshotManager.java (+0/-206)
clc/modules/interface/interface.iml (+0/-21)
clc/modules/interface/pom.xml (+0/-101)
clc/modules/interface/src/main/java/edu/ucsb/eucalyptus/ic/DNSReplyQueue.java (+7/-7)
clc/modules/interface/src/main/java/edu/ucsb/eucalyptus/ic/Eucalyptus.java (+4/-12)
clc/modules/interface/src/main/java/edu/ucsb/eucalyptus/ic/StorageReplyQueue.java (+5/-4)
clc/modules/interface/src/main/java/edu/ucsb/eucalyptus/ic/WalrusMessaging.java (+0/-120)
clc/modules/interface/src/main/java/edu/ucsb/eucalyptus/ic/WalrusReplyQueue.java (+0/-124)
clc/modules/key-manager/pom.xml (+0/-87)
clc/modules/key-manager/src/main/java/com/eucalyptus/keys/KeyPairManager.java (+2/-2)
clc/modules/key-manager/src/main/java/com/eucalyptus/keys/KeyPairUtil.java (+4/-8)
clc/modules/module-inc.xml (+136/-107)
clc/modules/msgs/build.xml (+1/-31)
clc/modules/msgs/conf/scripts/startup.groovy (+0/-77)
clc/modules/msgs/pom.xml (+0/-167)
clc/modules/msgs/src/main/java/com/eucalyptus/BaseException.java (+21/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/auth/Authentication.java (+153/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/auth/GroupExistsException.java (+23/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/auth/Groups.java (+62/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/auth/NoSuchGroupException.java (+85/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/auth/NoSuchUserException.java (+62/-65)
clc/modules/msgs/src/main/java/com/eucalyptus/auth/UserExistsException.java (+85/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/auth/UserInfo.java (+280/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/auth/UserInfoStore.java (+41/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/auth/Users.java (+130/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/auth/api/BaseLoginModule.java (+151/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/auth/api/BaseSecurityException.java (+40/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/auth/api/BaseSecurityProvider.java (+10/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/auth/api/CertificateProvider.java (+34/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/auth/api/CryptoProvider.java (+29/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/auth/api/GroupProvider.java (+27/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/auth/api/HmacProvider.java (+21/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/auth/api/NoSuchCertificateException.java (+39/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/auth/api/UserInfoProvider.java (+16/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/auth/api/UserProvider.java (+95/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/auth/crypto/Certs.java (+76/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/auth/crypto/Crypto.java (+51/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/auth/crypto/Digest.java (+31/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/auth/crypto/Hmac.java (+21/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/auth/crypto/Hmacs.java (+42/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/auth/crypto/Signatures.java (+52/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/auth/login/AuthenticationException.java (+88/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/auth/login/HmacCredentials.java (+73/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/auth/login/Hmacv1LoginModule.java (+78/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/auth/login/Hmacv2LoginModule.java (+98/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/auth/login/SecurityContext.java (+72/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/auth/login/WalrusWrappedComponentCredentials.java (+91/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/auth/login/WalrusWrappedCredentials.java (+85/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/auth/login/WrappedCredentials.java (+28/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/auth/login/WsSecCredentials.java (+12/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/auth/login/WsSecLoginModule.java (+56/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/auth/principal/Authorization.java (+43/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/auth/principal/AvailabilityZonePermission.java (+35/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/auth/principal/BaseAuthorization.java (+85/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/auth/principal/BasePrincipal.java (+37/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/auth/principal/Cluster.java (+7/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/auth/principal/ComponentPrincipal.java (+9/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/auth/principal/Eucalyptus.java (+6/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/auth/principal/Group.java (+41/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/auth/principal/Node.java (+6/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/auth/principal/Storage.java (+7/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/auth/principal/User.java (+82/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/auth/principal/Walrus.java (+5/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/auth/principal/credential/CredentialPrincipal.java (+12/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/auth/principal/credential/HmacPrincipal.java (+24/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/auth/principal/credential/X509Principal.java (+36/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/auth/principal/domain/ClusterDomain.java (+7/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/auth/principal/domain/Domain.java (+8/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/auth/principal/domain/ExternalDomain.java (+6/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/auth/principal/domain/UserDomain.java (+6/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/auth/util/B64.java (+72/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/auth/util/PEMFiles.java (+56/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/auth/util/SecurityParameter.java (+13/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/auth/util/Timestamps.java (+36/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/auth/util/WSSecurity.java (+117/-99)
clc/modules/msgs/src/main/java/com/eucalyptus/binding/Binding.java (+107/-228)
clc/modules/msgs/src/main/java/com/eucalyptus/binding/BindingDiscovery.java (+49/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/binding/BindingException.java (+7/-4)
clc/modules/msgs/src/main/java/com/eucalyptus/binding/BindingGenerator.java (+24/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/binding/BindingManager.java (+83/-68)
clc/modules/msgs/src/main/java/com/eucalyptus/binding/BuildBindings.java (+164/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/binding/HoldMe.java (+58/-54)
clc/modules/msgs/src/main/java/com/eucalyptus/binding/HttpEmbedded.java (+77/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/binding/HttpParameterMapping.java (+78/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/binding/InternalSoapBindingGenerator.java (+465/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/Bootstrap.java (+281/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/BootstrapException.java (+59/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/BootstrapFactory.java (+0/-183)
clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/Bootstrapper.java (+207/-99)
clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/BootstrapperDiscovery.java (+72/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/Component.java (+96/-167)
clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/DatabaseBootstrapper.java (+8/-2)
clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/DeferredInitializer.java (+0/-116)
clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/Depends.java (+0/-77)
clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/DependsLocal.java (+12/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/DependsRemote.java (+12/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/NeedsDeferredInitialization.java (+0/-75)
clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/Provides.java (+1/-2)
clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/Resource.java (+0/-166)
clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/ResourceProvider.java (+0/-151)
clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/RunDuring.java (+12/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/ServiceBootstrapper.java (+0/-152)
clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/ServiceJarDiscovery.java (+224/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/SystemBootstrapper.java (+139/-193)
clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/transitions/BootstrapTransition.java (+16/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/transitions/LoadConfigs.java (+63/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/component/AbstractServiceBuilder.java (+79/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/component/Component.java (+327/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/component/ComponentInformation.java (+11/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/component/Components.java (+290/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/component/Configuration.java (+152/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/component/Configurations.java (+19/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/component/Credentials.java (+40/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/component/DatabaseServiceBuilder.java (+93/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/component/DatabaseServiceConfigurationProvider.java (+82/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/component/DefaultServiceBuilder.java (+73/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/component/DefaultTransition.java (+26/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/component/DefaultTransitionList.java (+25/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/component/DiscoverableServiceBuilder.java (+12/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/component/Dispatcher.java (+27/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/component/DispatcherFactory.java (+28/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/component/DispatcherFactoryDiscovery.java (+23/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/component/Lifecycle.java (+63/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/component/Lifecycles.java (+72/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/component/Resource.java (+158/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/component/Service.java (+106/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/component/ServiceBuilder.java (+43/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/component/ServiceBuilderDiscovery.java (+28/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/component/ServiceConfiguration.java (+27/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/component/ServiceConfigurationProvider.java (+13/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/component/ServiceConfigurations.java (+18/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/component/ServiceEndpoint.java (+47/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/component/ServiceRegistrationException.java (+23/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/component/Services.java (+90/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/component/event/LifecycleEvent.java (+34/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/component/event/StartComponentEvent.java (+42/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/component/event/StopComponentEvent.java (+29/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/config/ConfigurationEntities.groovy (+321/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/configurable/AbstractConfigurableProperty.java (+95/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/configurable/ConfigurableClass.java (+16/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/configurable/ConfigurableField.java (+19/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/configurable/ConfigurableFieldType.java (+69/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/configurable/ConfigurableIdentifier.java (+11/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/configurable/ConfigurableProperty.java (+34/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/configurable/ConfigurablePropertyBuilder.java (+7/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/configurable/ConfigurablePropertyException.java (+23/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/configurable/ConfigurationProperties.java (+151/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/configurable/MultiDatabasePropertyEntry.java (+193/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/configurable/PropertiesBootstrapper.java (+25/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/configurable/PropertiesDiscovery.java (+42/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/configurable/PropertyDirectory.java (+153/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/configurable/PropertyTypeParser.java (+70/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/configurable/SingletonDatabasePropertyEntry.java (+148/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/configurable/StaticPropertyEntry.java (+81/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/context/Context.java (+136/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/context/Contexts.java (+89/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/context/IllegalContextAccessException.java (+21/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/context/NoSuchContextException.java (+23/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/context/ServiceContext.java (+205/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/context/ServiceInitializationException.java (+21/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/entities/Counters.java (+172/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/entities/EntityWrapper.java (+243/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/entities/PersistenceContextDiscovery.java (+42/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/entities/PersistenceContexts.java (+137/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/entities/TxHandle.java (+200/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/entities/VmType.java (+183/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/entities/_anon.java (+66/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/event/AbstractNamedRegistry.java (+6/-4)
clc/modules/msgs/src/main/java/com/eucalyptus/event/Event.java (+0/-1)
clc/modules/msgs/src/main/java/com/eucalyptus/event/EventListenerDiscovery.java (+40/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/event/ListenerRegistry.java (+2/-2)
clc/modules/msgs/src/main/java/com/eucalyptus/event/PassiveEventListener.java (+22/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/event/ReentrantListenerRegistry.java (+25/-18)
clc/modules/msgs/src/main/java/com/eucalyptus/event/StatefulNamedRegistry.java (+1/-3)
clc/modules/msgs/src/main/java/com/eucalyptus/event/SystemClock.java (+71/-3)
clc/modules/msgs/src/main/java/com/eucalyptus/http/MappingHttpMessage.java (+14/-14)
clc/modules/msgs/src/main/java/com/eucalyptus/http/MappingHttpRequest.java (+27/-22)
clc/modules/msgs/src/main/java/com/eucalyptus/http/MappingHttpResponse.java (+1/-1)
clc/modules/msgs/src/main/java/com/eucalyptus/images/Image.java (+48/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/images/ImageAuthorization.java (+68/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/images/ImageInfo.java (+408/-203)
clc/modules/msgs/src/main/java/com/eucalyptus/images/Images.java (+48/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/images/NoSuchImageException.java (+21/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/images/ProductCode.java (+1/-1)
clc/modules/msgs/src/main/java/com/eucalyptus/records/BaseRecord.java (+338/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/records/EventClass.java (+5/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/records/EventRecord.java (+68/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/records/EventType.java (+221/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/records/LogFileRecord.java (+44/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/records/Record.java (+27/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/records/RecordLevel.java (+12/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/scripting/ScriptExecutionFailedException.java (+89/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/scripting/groovy/GroovyUtil.java (+21/-12)
clc/modules/msgs/src/main/java/com/eucalyptus/system/Ats.java (+26/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/system/BaseDirectory.java (+113/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/system/DirectoryBootstrapper.java (+36/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/system/EucaLayout.java (+136/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/system/LogLevels.java (+8/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/system/SubDirectory.java (+116/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/system/Threads.java (+346/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/util/BaseDirectory.java (+0/-102)
clc/modules/msgs/src/main/java/com/eucalyptus/util/Committor.java (+6/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/util/Composite.java (+22/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/util/CompositeHelper.groovy (+71/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/util/Composites.java (+101/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/util/DebugUtil.java (+0/-180)
clc/modules/msgs/src/main/java/com/eucalyptus/util/EucaLayout.java (+0/-136)
clc/modules/msgs/src/main/java/com/eucalyptus/util/EucalyptusCloudException.java (+4/-2)
clc/modules/msgs/src/main/java/com/eucalyptus/util/EucalyptusProperties.java (+0/-99)
clc/modules/msgs/src/main/java/com/eucalyptus/util/ExceptionNotRelatedException.java (+0/-21)
clc/modules/msgs/src/main/java/com/eucalyptus/util/Exceptions.java (+59/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/util/Expendable.java (+74/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/util/FailScriptFailException.java (+0/-87)
clc/modules/msgs/src/main/java/com/eucalyptus/util/FinalReturn.java (+24/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/util/GenerateJiBXBinding.java (+0/-238)
clc/modules/msgs/src/main/java/com/eucalyptus/util/HasName.java (+64/-67)
clc/modules/msgs/src/main/java/com/eucalyptus/util/HasParent.java (+5/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/util/JoinTx.java (+7/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/util/LogUtil.groovy (+17/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/util/Mappable.java (+69/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/util/NetworkUtil.java (+61/-28)
clc/modules/msgs/src/main/java/com/eucalyptus/util/ServiceJarFile.java (+0/-190)
clc/modules/msgs/src/main/java/com/eucalyptus/util/SimpleTransition.java (+38/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/util/SubDirectory.java (+0/-96)
clc/modules/msgs/src/main/java/com/eucalyptus/util/TimedEvictionSet.java (+188/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/util/TransactionException.java (+21/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/util/TransactionFireException.java (+21/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/util/Transactions.java (+125/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/util/Transition.java (+240/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/util/Tx.java (+5/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/util/async/Callback.java (+166/-0)
clc/modules/msgs/src/main/java/com/eucalyptus/ws/Client.java (+4/-4)
clc/modules/msgs/src/main/java/com/eucalyptus/ws/WebServicesException.java (+2/-1)
clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/annotation/HttpBinding.java (+0/-77)
clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/annotation/HttpEmbedded.java (+0/-77)
clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/annotation/HttpParameterMapping.java (+0/-78)
clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/cloud/Extra.groovy (+218/-209)
clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/constants/EventType.java (+0/-90)
clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/constants/VmState.java (+0/-109)
clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/msgs/BaseMessage.java (+148/-0)
clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/msgs/Configuration.groovy (+2/-3)
clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/msgs/DNS.groovy (+8/-4)
clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/msgs/EventRecord.java (+0/-102)
clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/msgs/Messages.groovy (+111/-134)
clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/msgs/Properties.groovy (+92/-0)
clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/msgs/StorageController.groovy (+56/-62)
clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/msgs/Users.groovy (+112/-0)
clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/msgs/VmAddresses.groovy (+1/-1)
clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/msgs/VmBlockDevice.groovy (+22/-7)
clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/msgs/VmControl.groovy (+5/-4)
clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/msgs/VmImages.groovy (+8/-1)
clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/msgs/VmKeys.groovy (+1/-1)
clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/msgs/VmLocation.groovy (+1/-1)
clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/msgs/VmNetwork.groovy (+16/-12)
clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/msgs/VmSecurity.groovy (+2/-2)
clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/msgs/Walrus.groovy (+94/-33)
clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/util/BindingUtil.java (+0/-79)
clc/modules/msgs/src/main/resources/aws-images-09-10-31.xml (+118/-107)
clc/modules/msgs/src/main/resources/cc-types.xml (+162/-186)
clc/modules/msgs/src/main/resources/com.eucalyptus.CloudServiceProvider (+3/-0)
clc/modules/msgs/src/main/resources/eucalyptus-bootstrap.xml (+55/-49)
clc/modules/msgs/src/main/resources/s3-2006-03-01-binding.xml (+113/-44)
clc/modules/msgs/src/main/resources/storage-controller-binding.xml (+0/-38)
clc/modules/storage-common/src/main/java/edu/ucsb/eucalyptus/storage/StorageManager.java (+11/-0)
clc/modules/storage-common/src/main/java/edu/ucsb/eucalyptus/storage/fs/FileSystemStorageManager.java (+51/-1)
clc/modules/storage-controller/build.xml (+16/-14)
clc/modules/storage-controller/include/storage_native.h (+4/-0)
clc/modules/storage-controller/native/Makefile (+1/-0)
clc/modules/storage-controller/native/com_eucalyptus_storage_AOEManager.c (+49/-0)
clc/modules/storage-controller/native/com_eucalyptus_storage_OverlayManager.c (+88/-0)
clc/modules/storage-controller/native/edu_ucsb_eucalyptus_storage_AOEManager.c (+0/-48)
clc/modules/storage-controller/native/edu_ucsb_eucalyptus_storage_LVM2Manager.c (+0/-87)
clc/modules/storage-controller/native/liblvm2control.iml (+0/-124)
clc/modules/storage-controller/native/pom.xml (+0/-151)
clc/modules/storage-controller/pom.xml (+0/-161)
clc/modules/storage-controller/src/main/java/com/eucalyptus/bootstrap/BlockStorageBootstrapper.java (+10/-5)
clc/modules/storage-controller/src/main/java/com/eucalyptus/storage/AOEManager.java (+182/-0)
clc/modules/storage-controller/src/main/java/com/eucalyptus/storage/BlockStorageChecker.java (+280/-0)
clc/modules/storage-controller/src/main/java/com/eucalyptus/storage/BlockStorageManagerFactory.java (+89/-0)
clc/modules/storage-controller/src/main/java/com/eucalyptus/storage/ISCSIManager.java (+351/-0)
clc/modules/storage-controller/src/main/java/com/eucalyptus/storage/LogicalStorageManager.java (+128/-0)
clc/modules/storage-controller/src/main/java/com/eucalyptus/storage/OverlayManager.java (+1253/-0)
clc/modules/storage-controller/src/main/java/com/eucalyptus/storage/StorageExportManager.java (+83/-0)
clc/modules/storage-controller/src/main/java/edu/ucsb/eucalyptus/cloud/ws/BlockStorage.java (+252/-176)
clc/modules/storage-controller/src/main/java/edu/ucsb/eucalyptus/cloud/ws/BlockStorageEventListener.java (+92/-0)
clc/modules/storage-controller/src/main/java/edu/ucsb/eucalyptus/cloud/ws/BlockStorageStatistics.java (+17/-4)
clc/modules/storage-controller/src/main/java/edu/ucsb/eucalyptus/cloud/ws/HttpReader.java (+44/-8)
clc/modules/storage-controller/src/main/java/edu/ucsb/eucalyptus/cloud/ws/HttpWriter.java (+2/-2)
clc/modules/storage-controller/src/main/java/edu/ucsb/eucalyptus/cloud/ws/SnapshotProgressCallback.java (+4/-5)
clc/modules/storage-controller/src/main/java/edu/ucsb/eucalyptus/cloud/ws/SnapshotService.java (+1/-1)
clc/modules/storage-controller/src/main/java/edu/ucsb/eucalyptus/cloud/ws/StorageEventListener.java (+0/-119)
clc/modules/storage-controller/src/main/java/edu/ucsb/eucalyptus/cloud/ws/tests/CreateSnapshotTest.java (+1/-1)
clc/modules/storage-controller/src/main/java/edu/ucsb/eucalyptus/cloud/ws/tests/DeleteSnapshotTest.java (+1/-1)
clc/modules/storage-controller/src/main/java/edu/ucsb/eucalyptus/cloud/ws/tests/VolumeTest.java (+1/-1)
clc/modules/storage-controller/src/main/java/edu/ucsb/eucalyptus/ic/StorageController.java (+0/-105)
clc/modules/storage-controller/src/main/java/edu/ucsb/eucalyptus/storage/AOEManager.java (+0/-185)
clc/modules/storage-controller/src/main/java/edu/ucsb/eucalyptus/storage/BlockStorageChecker.java (+0/-315)
clc/modules/storage-controller/src/main/java/edu/ucsb/eucalyptus/storage/BlockStorageManagerFactory.java (+0/-72)
clc/modules/storage-controller/src/main/java/edu/ucsb/eucalyptus/storage/ISCSIManager.java (+0/-213)
clc/modules/storage-controller/src/main/java/edu/ucsb/eucalyptus/storage/LogicalStorageManager.java (+0/-114)
clc/modules/storage-controller/src/main/java/edu/ucsb/eucalyptus/storage/StorageExportManager.java (+0/-83)
clc/modules/storage-controller/src/main/resources/com.eucalyptus.CloudServiceProvider (+3/-0)
clc/modules/storage-controller/src/main/resources/storage-model.xml (+112/-123)
clc/modules/storage-controller/src/main/resources/storage-services.xml (+4/-4)
clc/modules/walrus/pom.xml (+0/-146)
clc/modules/walrus/src/main/java/com/eucalyptus/auth/login/WalrusComponentLoginModule.java (+153/-0)
clc/modules/walrus/src/main/java/com/eucalyptus/auth/login/WalrusLoginModule.java (+122/-0)
clc/modules/walrus/src/main/java/edu/ucsb/eucalyptus/cloud/ws/TorrentCreator.java (+1/-1)
clc/modules/walrus/src/main/java/edu/ucsb/eucalyptus/cloud/ws/Tracker.java (+18/-5)
clc/modules/walrus/src/main/java/edu/ucsb/eucalyptus/cloud/ws/WalrusBlockStorageManager.java (+100/-70)
clc/modules/walrus/src/main/java/edu/ucsb/eucalyptus/cloud/ws/WalrusControl.java (+63/-86)
clc/modules/walrus/src/main/java/edu/ucsb/eucalyptus/cloud/ws/WalrusEventListener.java (+8/-20)
clc/modules/walrus/src/main/java/edu/ucsb/eucalyptus/cloud/ws/WalrusImageManager.java (+278/-39)
clc/modules/walrus/src/main/java/edu/ucsb/eucalyptus/cloud/ws/WalrusManager.java (+2029/-760)
clc/modules/walrus/src/main/java/edu/ucsb/eucalyptus/cloud/ws/WalrusStatistics.java (+1/-1)
clc/modules/walrus/src/main/java/edu/ucsb/eucalyptus/ic/Walrus.java (+0/-100)
clc/modules/walrus/src/main/resources/com.eucalyptus.CloudServiceProvider (+4/-1)
clc/modules/walrus/src/main/resources/walrus-model.xml (+60/-77)
clc/modules/walrus/src/main/resources/walrus-services.xml (+2/-2)
clc/modules/walrus/storage-manager.iml (+0/-19)
clc/modules/wsstack/conf/scripts/walruslogger.groovy (+10/-0)
clc/modules/wsstack/pom.xml (+0/-222)
clc/modules/wsstack/src/main/java/com/eucalyptus/ws/AuthenticationException.java (+0/-87)
clc/modules/wsstack/src/main/java/com/eucalyptus/ws/DeferredPropertiesBootstrapper.java (+119/-0)
clc/modules/wsstack/src/main/java/com/eucalyptus/ws/EucalyptusRemoteFault.java (+22/-0)
clc/modules/wsstack/src/main/java/com/eucalyptus/ws/ServiceDispatchBootstrapper.java (+136/-171)
clc/modules/wsstack/src/main/java/com/eucalyptus/ws/ServiceNotReadyException.java (+25/-0)
clc/modules/wsstack/src/main/java/com/eucalyptus/ws/ServiceVerifyBootstrapper.java (+43/-26)
clc/modules/wsstack/src/main/java/com/eucalyptus/ws/client/DefaultDispatcherFactory.java (+30/-0)
clc/modules/wsstack/src/main/java/com/eucalyptus/ws/client/HeartbeatClient.java (+7/-6)
clc/modules/wsstack/src/main/java/com/eucalyptus/ws/client/LocalDispatcher.java (+4/-8)
clc/modules/wsstack/src/main/java/com/eucalyptus/ws/client/NioBootstrap.java (+1/-1)
clc/modules/wsstack/src/main/java/com/eucalyptus/ws/client/NioClient.java (+9/-8)
clc/modules/wsstack/src/main/java/com/eucalyptus/ws/client/NioMessageAdapter.java (+3/-3)
clc/modules/wsstack/src/main/java/com/eucalyptus/ws/client/NioMessageDispatcher.java (+5/-5)
clc/modules/wsstack/src/main/java/com/eucalyptus/ws/client/NioMessageReceiver.java (+0/-4)
clc/modules/wsstack/src/main/java/com/eucalyptus/ws/client/RemoteBootstrapperClient.java (+47/-36)
clc/modules/wsstack/src/main/java/com/eucalyptus/ws/client/RemoteDispatcher.java (+14/-18)
clc/modules/wsstack/src/main/java/com/eucalyptus/ws/client/ServiceDispatcher.java (+63/-25)
clc/modules/wsstack/src/main/java/com/eucalyptus/ws/client/ServiceEventListener.java (+18/-36)
clc/modules/wsstack/src/main/java/com/eucalyptus/ws/client/pipeline/ClusterClientPipeline.java (+3/-3)
clc/modules/wsstack/src/main/java/com/eucalyptus/ws/client/pipeline/InternalClientPipeline.java (+1/-1)
clc/modules/wsstack/src/main/java/com/eucalyptus/ws/client/pipeline/NioClientPipeline.java (+8/-7)
clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/BindingHandler.java (+18/-14)
clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/ChannelStateMonitor.java (+21/-12)
clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/EucalyptusQueryBinding.java (+13/-12)
clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/HeartbeatHandler.java (+158/-114)
clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/HmacHandler.java (+92/-153)
clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/MessageStackHandler.java (+4/-3)
clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/NioHttpResponseDecoder.java (+2/-2)
clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/NioResponseHandler.java (+20/-20)
clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/QueryTimestampHandler.java (+15/-13)
clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/ResponseHandler.java (+14/-0)
clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/RestfulMarshallingHandler.java (+94/-92)
clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/ServiceSinkHandler.java (+112/-52)
clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/SoapMarshallingHandler.java (+3/-3)
clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/UploadPolicyChecker.java (+216/-0)
clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/WalrusAuthenticationHandler.java (+96/-101)
clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/WalrusOutboundHandler.java (+9/-2)
clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/WalrusPOSTAuthenticationHandler.java (+16/-163)
clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/WalrusPOSTIncomingHandler.java (+3/-4)
clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/WalrusRESTBinding.java (+90/-57)
clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/WalrusRESTLoggerInbound.java (+12/-11)
clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/WalrusRESTLoggerOutbound.java (+5/-3)
clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/WalrusSoapHandler.java (+3/-3)
clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/WalrusSoapUserAuthenticationHandler.java (+12/-11)
clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/http/NioHttpDecoder.java (+5/-2)
clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/http/NioHttpRequestEncoder.java (+1/-1)
clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/soap/AddressingHandler.java (+2/-2)
clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/soap/SoapHandler.java (+4/-4)
clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/wssecurity/ClusterWsSecHandler.java (+0/-5)
clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/wssecurity/InternalWsSecHandler.java (+20/-11)
clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/wssecurity/UserWsSecHandler.java (+4/-16)
clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/wssecurity/WsSecHandler.java (+2/-8)
clc/modules/wsstack/src/main/java/com/eucalyptus/ws/server/ElasticFoxPipeline.java (+1/-1)
clc/modules/wsstack/src/main/java/com/eucalyptus/ws/server/EucalyptusQueryPipeline.java (+4/-4)
clc/modules/wsstack/src/main/java/com/eucalyptus/ws/server/EucalyptusSoapPipeline.java (+1/-5)
clc/modules/wsstack/src/main/java/com/eucalyptus/ws/server/FilteredPipeline.java (+10/-15)
clc/modules/wsstack/src/main/java/com/eucalyptus/ws/server/HeartbeatPipeline.java (+0/-14)
clc/modules/wsstack/src/main/java/com/eucalyptus/ws/server/InternalQueryPipeline.java (+3/-3)
clc/modules/wsstack/src/main/java/com/eucalyptus/ws/server/InternalSoapPipeline.java (+1/-1)
clc/modules/wsstack/src/main/java/com/eucalyptus/ws/server/MetadataPipeline.java (+5/-2)
clc/modules/wsstack/src/main/java/com/eucalyptus/ws/server/NioServerHandler.java (+43/-20)
clc/modules/wsstack/src/main/java/com/eucalyptus/ws/server/NioServerPipelineFactory.java (+0/-5)
clc/modules/wsstack/src/main/java/com/eucalyptus/ws/server/RemoteBootstrapperServer.java (+46/-14)
clc/modules/wsstack/src/main/java/com/eucalyptus/ws/server/WalrusRESTPipeline.java (+2/-2)
clc/modules/wsstack/src/main/java/com/eucalyptus/ws/server/WalrusRESTPostPipeline.java (+2/-2)
clc/modules/wsstack/src/main/java/com/eucalyptus/ws/stages/BindingStage.java (+0/-4)
clc/modules/wsstack/src/main/java/com/eucalyptus/ws/stages/ElasticFoxMangleHandler.java (+6/-3)
clc/modules/wsstack/src/main/java/com/eucalyptus/ws/stages/HmacUserAuthenticationStage.java (+7/-9)
clc/modules/wsstack/src/main/java/com/eucalyptus/ws/stages/QueryBindingStage.java (+2/-2)
clc/modules/wsstack/src/main/java/com/eucalyptus/ws/stages/SoapUserAuthenticationStage.java (+0/-2)
clc/modules/wsstack/src/main/java/com/eucalyptus/ws/stages/WalrusOutboundStage.java (+1/-1)
clc/modules/wsstack/src/main/java/com/eucalyptus/ws/stages/WalrusPOSTUserAuthenticationStage.java (+1/-1)
clc/modules/wsstack/src/main/java/com/eucalyptus/ws/util/ChannelUtil.java (+123/-90)
clc/modules/wsstack/src/main/java/com/eucalyptus/ws/util/HmacUtils.java (+5/-38)
clc/modules/wsstack/src/main/java/com/eucalyptus/ws/util/PipelineRegistry.java (+5/-6)
clc/modules/wsstack/src/main/java/com/eucalyptus/ws/util/ReplyQueue.java (+56/-45)
clc/modules/wsstack/src/main/java/com/eucalyptus/ws/util/RequestQueue.java (+27/-57)
clc/modules/wsstack/src/main/java/com/eucalyptus/ws/util/WalrusBucketLogger.java (+17/-10)
clc/modules/www/build.xml (+48/-23)
clc/modules/www/conf/www/admin.xml (+1/-0)
clc/modules/www/pom.xml (+0/-232)
clc/modules/www/src/main/java/com/eucalyptus/bootstrap/HttpServerBootstrapper.java (+142/-82)
clc/modules/www/src/main/java/com/eucalyptus/www/Redirect.java (+28/-0)
clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/EucalyptusWebInterface.gwt.xml (+8/-3)
clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/client/ClusterInfoTable.java (+59/-94)
clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/client/ContentControl.java (+8/-0)
clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/client/Debugging.java (+19/-0)
clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/client/EucaButton.java (+143/-0)
clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/client/EucaImageButton.java (+129/-0)
clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/client/EucalyptusWebBackend.java (+1/-0)
clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/client/EucalyptusWebBackendAsync.java (+3/-0)
clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/client/EucalyptusWebInterface.java (+14/-14)
clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/client/ImageInfoWeb.java (+9/-8)
clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/client/StorageInfoWeb.java (+107/-150)
clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/client/SystemConfigTable.java (+8/-6)
clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/client/SystemConfigWeb.java (+166/-177)
clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/client/Tooltip.java (+66/-0)
clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/client/UserInfoWeb.java (+54/-57)
clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/client/VmTypeTable.java (+5/-3)
clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/client/WalrusInfoTable.java (+64/-65)
clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/client/WalrusInfoWeb.java (+12/-64)
clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/client/util/Buttons.java (+22/-0)
clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/client/util/Events.java (+12/-0)
clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/client/util/Images.java (+5/-0)
clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/client/util/Observer.java (+6/-0)
clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/public/EucalyptusWebInterface.html (+1/-0)
clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/server/EucalyptusManagement.java (+187/-328)
clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/server/EucalyptusWebBackendImpl.java (+107/-40)
clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/server/Registration.java (+136/-198)
clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/server/RemoteInfoHandler.java (+219/-225)
clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/server/X509Download.java (+163/-164)
clc/modules/www/src/main/resources/com.eucalyptus.CloudServiceProvider (+4/-1)
clc/modules/www/src/main/resources/eucalyptus-jetty.xml (+89/-74)
clc/modules/www/test-gwt/.classpath (+7/-0)
clc/modules/www/test-gwt/.project (+29/-0)
clc/modules/www/test-gwt/src/edu/ucsb/eucalyptus/admin/EucalyptusWebInterface.gwt.xml (+101/-0)
clc/modules/www/test-gwt/src/edu/ucsb/eucalyptus/admin/server/EucalyptusWebBackendImpl.java (+288/-0)
clc/modules/www/test-gwt/war/WEB-INF/web.xml (+24/-0)
clc/pom.xml (+0/-802)
clc/tools/.project (+17/-0)
clc/tools/.pydevproject (+10/-0)
clc/tools/src/euca-add-group (+17/-0)
clc/tools/src/euca-add-user (+14/-0)
clc/tools/src/euca-add-user-group (+14/-0)
clc/tools/src/euca-delete-user (+14/-0)
clc/tools/src/euca-delete-user-group (+14/-0)
clc/tools/src/euca-deregister-cluster (+14/-0)
clc/tools/src/euca-deregister-storage-controller (+14/-0)
clc/tools/src/euca-deregister-walrus (+17/-0)
clc/tools/src/euca-describe-clusters (+12/-0)
clc/tools/src/euca-describe-groups (+15/-0)
clc/tools/src/euca-describe-properties (+12/-0)
clc/tools/src/euca-describe-storage-controllers (+12/-0)
clc/tools/src/euca-describe-user-groups (+12/-0)
clc/tools/src/euca-describe-users (+12/-0)
clc/tools/src/euca-describe-walruses (+12/-0)
clc/tools/src/euca-get-credentials (+21/-0)
clc/tools/src/euca-modify-property (+12/-0)
clc/tools/src/euca-register-cluster (+14/-0)
clc/tools/src/euca-register-storage-controller (+14/-0)
clc/tools/src/euca-register-walrus (+17/-0)
clc/tools/src/euca_admin/__init__.py (+46/-0)
clc/tools/src/euca_admin/clusters.py (+94/-0)
clc/tools/src/euca_admin/generic.py (+41/-0)
clc/tools/src/euca_admin/groups.py (+90/-0)
clc/tools/src/euca_admin/properties.py (+105/-0)
clc/tools/src/euca_admin/storagecontrollers.py (+94/-0)
clc/tools/src/euca_admin/users.py (+142/-0)
clc/tools/src/euca_admin/walruses.py (+67/-0)
cluster/CCclient.c (+8/-2)
cluster/Makefile (+10/-10)
cluster/axis2_svc_generated.patch (+1/-1)
cluster/cc-client-marshal-adb.c (+7/-12)
cluster/cc-client-marshal.h (+2/-1)
cluster/handlers.c (+885/-692)
cluster/handlers.h (+25/-28)
cluster/server-marshal.c (+17/-24)
configure (+87/-9)
configure.ac (+1/-0)
debian/axis2.xml (+0/-128)
debian/control (+16/-13)
debian/eucalyptus-cc.install (+1/-1)
debian/eucalyptus-cloud.install (+0/-2)
debian/eucalyptus-cloud.postinst (+3/-3)
debian/eucalyptus-common.install (+37/-3)
debian/eucalyptus-common.postinst (+10/-2)
debian/eucalyptus-common.preinst (+15/-1)
debian/eucalyptus-java-common.install (+6/-16)
debian/eucalyptus-java-common.postinst (+17/-0)
debian/eucalyptus-nc.install (+4/-5)
debian/eucalyptus-sc.install (+0/-1)
debian/eucalyptus-walrus.install (+0/-1)
debian/patches/03-DESTDIR.patch (+0/-282)
debian/rules (+1/-2)
eucalyptus.spec (+156/-85)
gatherlog/Makefile (+1/-1)
gatherlog/handlers.c (+15/-9)
net/Makefile (+1/-1)
net/dhcp.c (+0/-344)
net/dhcp.h (+0/-99)
net/test.c (+0/-104)
net/vnetwork.c (+154/-114)
net/vnetwork.h (+14/-6)
node/Makefile (+7/-7)
node/NCclient.c (+21/-6)
node/axis2_svc_generated.patch (+1/-1)
node/client-marshal-adb.c (+86/-48)
node/client-marshal-local.c (+2/-2)
node/client-marshal.h (+2/-1)
node/handlers.c (+172/-76)
node/handlers.h (+44/-20)
node/handlers_default.c (+67/-25)
node/handlers_kvm.c (+168/-36)
node/handlers_xen.c (+124/-68)
node/server-marshal.c (+17/-16)
node/test_nc.c (+1/-0)
storage/storage.c (+191/-72)
storage/storage.h (+9/-1)
storage/walrus.c (+3/-3)
tools/Makefile (+22/-22)
tools/add_key.pl (+17/-0)
tools/connect_iscsitarget.pl (+32/-25)
tools/detach.pl (+36/-3)
tools/disconnect_iscsitarget.pl (+7/-2)
tools/euca-axis2c.spec-not (+16/-12)
tools/euca-rampartc.spec-not (+14/-15)
tools/euca_conf.8 (+8/-8)
tools/euca_conf.in (+77/-44)
tools/euca_upgrade (+212/-137)
tools/eucalyptus-cloud.in (+11/-9)
tools/eucalyptus-nc.in (+17/-5)
tools/eucalyptus.conf (+46/-9)
tools/eucalyptus.conf.5 (+222/-0)
tools/gen_kvm_libvirt_xml (+48/-2)
tools/get_iscsitarget.pl (+1/-1)
tools/partition2disk (+14/-0)
util/Makefile (+6/-6)
util/adb-helpers.h (+48/-0)
util/data.c (+38/-8)
util/data.h (+31/-19)
util/euca_auth.c (+2/-167)
util/euca_auth.h (+0/-15)
util/euca_axis.c (+258/-0)
util/euca_axis.h (+84/-0)
util/euca_mountwrap.c (+18/-5)
util/euca_rootwrap.c (+10/-0)
util/eucalyptus-config.h.in (+2/-0)
util/eucalyptus.h (+34/-2)
util/ipc.c (+22/-10)
util/ipc.h (+2/-0)
util/misc.c (+396/-122)
util/misc.h (+19/-10)
util/pwcb.c (+0/-172)
wsdl/eucalyptus_cc.wsdl (+23/-24)
wsdl/eucalyptus_nc.wsdl (+26/-11)
Text conflict in clc/modules/cluster-manager/src/main/java/com/eucalyptus/address/AbstractSystemAddressManager.java
Text conflict in clc/modules/cluster-manager/src/main/java/com/eucalyptus/address/Address.java
Text conflict in clc/modules/cluster-manager/src/main/java/com/eucalyptus/address/AddressCategory.java
Text conflict in clc/modules/cluster-manager/src/main/java/com/eucalyptus/address/DynamicSystemAddressManager.java
Conflict: can't delete clc/modules/cluster-manager/src/main/java/com/eucalyptus/net because it is not empty.  Not deleting.
Conflict because clc/modules/cluster-manager/src/main/java/com/eucalyptus/net is not versioned, but has versioned children.  Versioned directory.
Conflict: can't delete clc/modules/cluster-manager/src/main/java/com/eucalyptus/net/util because it is not empty.  Not deleting.
Conflict because clc/modules/cluster-manager/src/main/java/com/eucalyptus/net/util is not versioned, but has versioned children.  Versioned directory.
Contents conflict in clc/modules/cluster-manager/src/main/java/com/eucalyptus/net/util/ClusterAddressInfo.groovy
Conflict: can't delete clc/modules/cluster-manager/src/main/java/edu because it is not empty.  Not deleting.
Conflict because clc/modules/cluster-manager/src/main/java/edu is not versioned, but has versioned children.  Versioned directory.
Conflict: can't delete clc/modules/cluster-manager/src/main/java/edu/ucsb because it is not empty.  Not deleting.
Conflict because clc/modules/cluster-manager/src/main/java/edu/ucsb is not versioned, but has versioned children.  Versioned directory.
Conflict: can't delete clc/modules/cluster-manager/src/main/java/edu/ucsb/eucalyptus because it is not empty.  Not deleting.
Conflict because clc/modules/cluster-manager/src/main/java/edu/ucsb/eucalyptus is not versioned, but has versioned children.  Versioned directory.
Conflict: can't delete clc/modules/cluster-manager/src/main/java/edu/ucsb/eucalyptus/cloud because it is not empty.  Not deleting.
Conflict because clc/modules/cluster-manager/src/main/java/edu/ucsb/eucalyptus/cloud is not versioned, but has versioned children.  Versioned directory.
Conflict: can't delete clc/modules/cluster-manager/src/main/java/edu/ucsb/eucalyptus/cloud/cluster because it is not empty.  Not deleting.
Conflict because clc/modules/cluster-manager/src/main/java/edu/ucsb/eucalyptus/cloud/cluster is not versioned, but has versioned children.  Versioned directory.
Contents conflict in clc/modules/cluster-manager/src/main/java/edu/ucsb/eucalyptus/cloud/cluster/AssignAddressCallback.java
Contents conflict in clc/modules/cluster-manager/src/main/java/edu/ucsb/eucalyptus/cloud/cluster/ConsoleOutputCallback.java
Contents conflict in clc/modules/cluster-manager/src/main/java/edu/ucsb/eucalyptus/cloud/cluster/QueuedEventCallback.java
Contents conflict in clc/modules/cluster-manager/src/main/java/edu/ucsb/eucalyptus/cloud/cluster/UnassignAddressCallback.groovy
Contents conflict in clc/modules/cluster-manager/src/main/java/edu/ucsb/eucalyptus/cloud/cluster/VmInstance.java
Contents conflict in clc/modules/cluster-manager/src/main/java/edu/ucsb/eucalyptus/cloud/cluster/VmInstances.java
Conflict: can't delete clc/modules/cluster-manager/src/main/java/edu/ucsb/eucalyptus/cloud/ws because it is not empty.  Not deleting.
Conflict because clc/modules/cluster-manager/src/main/java/edu/ucsb/eucalyptus/cloud/ws is not versioned, but has versioned children.  Versioned directory.
Contents conflict in clc/modules/cluster-manager/src/main/java/edu/ucsb/eucalyptus/cloud/ws/SystemState.java
Contents conflict in clc/modules/cluster-manager/src/main/java/edu/ucsb/eucalyptus/cloud/ws/VmMetadata.java
Contents conflict in clc/modules/core/conf/scripts/Import_161.groovy
Contents conflict in clc/modules/core/src/main/java/edu/ucsb/eucalyptus/util/EucalyptusProperties.java
Contents conflict in clc/modules/database/conf/scripts/entities.groovy
Conflict: can't delete clc/modules/image-manager/src/main/java/com/eucalyptus/images/util because it is not empty.  Not deleting.
Conflict because clc/modules/image-manager/src/main/java/com/eucalyptus/images/util is not versioned, but has versioned children.  Versioned directory.
Contents conflict in clc/modules/image-manager/src/main/java/com/eucalyptus/images/util/StorageUtil.java
Contents conflict in clc/modules/image-manager/src/main/java/edu/ucsb/eucalyptus/cloud/ws/ImageManager.java
Contents conflict in clc/modules/image-manager/src/main/java/edu/ucsb/eucalyptus/cloud/ws/VolumeManager.java
Text conflict in clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/msgs/VmBlockDevice.groovy
Text conflict in clc/modules/storage-common/src/main/java/edu/ucsb/eucalyptus/storage/StorageManager.java
Text conflict in clc/modules/storage-common/src/main/java/edu/ucsb/eucalyptus/storage/fs/FileSystemStorageManager.java
Text conflict in clc/modules/storage-controller/src/main/java/edu/ucsb/eucalyptus/cloud/ws/BlockStorage.java
Conflict: can't delete clc/modules/storage-controller/src/main/java/edu/ucsb/eucalyptus/storage because it is not empty.  Not deleting.
Conflict because clc/modules/storage-controller/src/main/java/edu/ucsb/eucalyptus/storage is not versioned, but has versioned children.  Versioned directory.
Contents conflict in clc/modules/storage-controller/src/main/java/edu/ucsb/eucalyptus/storage/LVM2Manager.java
Text conflict in clc/modules/walrus/src/main/java/edu/ucsb/eucalyptus/cloud/ws/WalrusImageManager.java
Text conflict in clc/modules/walrus/src/main/java/edu/ucsb/eucalyptus/cloud/ws/WalrusManager.java
Text conflict in clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/ChannelStateMonitor.java
Text conflict in clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/QueryTimestampHandler.java
Text conflict in clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/ServiceSinkHandler.java
Text conflict in clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/WalrusRESTBinding.java
Text conflict in clc/modules/wsstack/src/main/java/com/eucalyptus/ws/server/NioServerHandler.java
Text conflict in cluster/handlers.c
Contents conflict in debian/build-jars
Text conflict in debian/control
Contents conflict in debian/eucalyptus-java-common.links
Text conflict in eucalyptus.spec
Text conflict in net/vnetwork.c
Text conflict in node/handlers.c
Text conflict in node/handlers_default.c
Text conflict in node/handlers_kvm.c
Text conflict in tools/euca_conf.in
Text conflict in tools/euca_upgrade
To merge this branch: bzr merge lp://qastaging/~kirkland/eucalyptus/label-metadata
Reviewer Review Type Date Requested Status
Eucalyptus Maintainers Pending
Review via email: mp+32924@code.qastaging.launchpad.net

Description of the change

See commit message

To post a comment you must log in.

Unmerged revisions

1232. By Dustin Kirkland 

cluster/handlers.c, net/vnetwork.c: label the 169.254.169.254 link
local address with :metadata, the public vm ip addresses with :pub,
and the private vm ip addresses with :priv, to separate it appropriately
(LP: #451607, #452754)

1231. By decker <decker@hawaii>

merge bugs fixes related to LP: #566792 #606243 #563175 #613832

1230. By decker <decker@personal-army>

fix url construction for components with absent configuration files (LP: #613033) and restore ssl support (LP: #584497)

1229. By decker <decker@personal-army>

merge missing fix to addressing

1228. By decker <decker@personal-army>

merge fixes to addressing, volume attach, remote components, and upgrade. see merge log for details

1227. By Neil <neil@pall>

fixes LP: #611769

1226. By Neil <neil@pall>

fixes LP: #617032

1225. By decker <decker@personal-army>

fix to remote sc/walrus bootstrap

1224. By decker <decker@hawaii>

fix to remote sc/walrus bootstrap

1223. By Dmitrii Zagorodnov <email address hidden>

changed sudo to euca_rootwrap in ISCSIManager; small change in spec file

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches